1.0.0

SAP-archive · Dec 15, 2015 · 0f114b0 · 0f114b0
1 parent e92bcb7
commit 0f114b0
Show file tree

Hide file tree

Showing 84 changed files with 2,072 additions and 853 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ public/js/app/shared/app-config.js
 coverage/
 config/config.js
 dist
-.DS_Store
+.DS_Store
+.vscode
diff --git a/config/karma.conf.js b/config/karma.conf.js
@@ -47,7 +47,11 @@ module.exports = function(config){
         'public/js/app/shared/services/http-queue.js',
         'public/js/app/shared/services/event-service.js',
         'public/js/app/shared/services/local-storage.js',
-        'public/js/app/shared/services/site-selector-service.js',
+
+        'public/js/app/shared/directives/site-selector/site-selector-service.js',
+        'public/js/app/shared/directives/site-selector/site-selector-ctrl.js',
+        'public/js/app/shared/directives/site-selector/site-selector-directive.js',
+
         'public/js/app/shared/controllers/sidebar-navigation-ctrl.js',
         'public/js/app/shared/controllers/top-navigation-ctrl.js',
         'public/js/app/shared/i18n/i18-index.js',
@@ -60,6 +64,7 @@ module.exports = function(config){
         'public/js/app/shared/directives/y-tracking.js',
         'public/js/app/shared/directives/y-search.js',
         'public/js/app/shared/directives/y-inputs-dir.js',
+        'public/js/app/shared/directives/force-scroll.js',
 
         'public/js/app/home/home-index.js',
         'public/js/app/home/controllers/home-ctrl.js',
@@ -94,6 +99,9 @@ module.exports = function(config){
         'public/js/app/checkout/services/checkout-rest.js',
         'public/js/app/checkout/services/checkout-service.js',
 
+        'public/js/app/shipping/services/shipping-service.js',
+        'public/js/app/shipping/services/shipping-rest.js',
+
         'public/js/app/confirmation/confirmation-index.js',
         'public/js/app/confirmation/controllers/confirmation-ctrl.js',
         'public/js/app/confirmation/services/order-details-svc.js',
@@ -132,7 +140,6 @@ module.exports = function(config){
         'public/js/app/shared/router.js',
         'public/js/app/shared/http-proxy.js',
 
-        'public/js/app/shared/controllers/site-selector-ctrl.js',
         'public/js/app/shared/directives/quantity-input.js',
         'public/js/app/shared/directives/popover.js',
 
@@ -159,8 +166,7 @@ module.exports = function(config){
         'test/unit/orders/*.js',
         'test/unit/products/*.js',
         'test/unit/search/*.js',
-        'test/unit/shared/*.js',
-        'test/unit/shared/*/*.js'
+        'test/unit/shared/**/*.js'
 
     ],
 

diff --git a/public/img/ico_default.png b/public/img/ico_default.png
diff --git a/public/index.html b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html ng-class="{'disable-scroll': showCart || showMobileNav || checkoutCartEditVisible }">
+<html ng-class="{'disable-scroll': showCart || showMobileNav || checkoutCartEditVisible, 'force-scroll': forceScroll }">
 <head>
     <meta charset="utf8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -21,11 +21,11 @@
     <![endif]-->
 </head>
 <body ng-class="{'fixedLayout': showCart }">
-    <div ng-class="{'right': showCart, 'left': showMobileNav}" class="off-canvas"  >
-        <div ui-view="sidebarNavigation" class="sidebar-offcanvas hidden-md hidden-lg" id="sidebar" role="navigation" ></div>
+    <div ng-class="{'right': showCart, 'left': showMobileNav}" class="off-canvas">
+        <div ui-view="sidebarNavigation" class="sidebar-offcanvas hidden-md hidden-lg" id="sidebar" role="navigation"></div>
         <div class="mainContent" ng-class="{'main-on-top': checkoutCartEditVisible }">
-            <div ui-view="topNavigation" ></div>
-            <div class="main" >
+            <div ui-view="topNavigation"></div>
+            <div class="main">
                 <div ui-view="main"></div>
                 <!--<div class="content-mask" ng-click="closeOffcanvas()"></div>-->
             </div>
@@ -54,7 +54,7 @@
     <script src="js/vendor/angular-directive.g-signin/google-plus-signin.js"></script>
     <script src="js/vendor/angular-sanitize/angular-sanitize.min.js"></script>
     <script src="js/vendor/angular-ui-select/dist/select.min.js"></script>
-    <script src="js/vendor/algoliasearch/dist/algoliasearch.angular.js"></script> 
+    <script src="js/vendor/algoliasearch/dist/algoliasearch.angular.js"></script>
     <script src="js/bootstrap.js"></script>
     <script src="js/vendor/spin.js/spin.js"></script>
     <script src="js/app/shared/shared-index.js"></script>
@@ -72,15 +72,19 @@
     <script src="js/app/shared/directives/y-tracking.js"></script>
     <script src="js/app/shared/directives/y-search.js"></script>
     <script src="js/app/shared/directives/y-inputs-dir.js"></script>
+    <script src="js/app/shared/directives/force-scroll.js"></script>
     <script src="js/app/shared/services/cookie-svc.js"></script>
     <script src="js/app/shared/services/global-data.js"></script>
     <script src="js/app/shared/services/site-settings-rest.js"></script>
     <script src="js/app/shared/services/configuration-service.js"></script>
     <script src="js/app/shared/services/http-queue.js"></script>
     <script src="js/app/shared/services/event-service.js"></script>
     <script src="js/app/shared/services/local-storage.js"></script>
-    <script src="js/app/shared/services/site-selector-service.js"></script>
-    <script src="js/app/shared/controllers/site-selector-ctrl.js"></script>
+
+    <script src="js/app/shared/directives/site-selector/site-selector-directive.js"></script>
+    <script src="js/app/shared/directives/site-selector/site-selector-ctrl.js"></script>
+    <script src="js/app/shared/directives/site-selector/site-selector-service.js"></script>
+
     <script src="js/app/shared/controllers/sidebar-navigation-ctrl.js"></script>
     <script src="js/app/shared/controllers/top-navigation-ctrl.js"></script>
     <script src="js/app/shared/filters/filters.js"></script>
@@ -126,6 +130,8 @@
     <script src="js/app/checkout/directives/mobile-checkout-wizard.js"></script>
     <script src="js/app/checkout/services/checkout-rest.js"></script>
     <script src="js/app/checkout/services/checkout-service.js"></script>
+    <script src="js/app/shipping/services/shipping-rest.js"></script>
+    <script src="js/app/shipping/services/shipping-service.js"></script>
     <script src="js/app/confirmation/confirmation-index.js"></script>
     <script src="js/app/confirmation/controllers/confirmation-ctrl.js"></script>
     <script src="js/app/confirmation/services/order-details-svc.js"></script>
@@ -164,7 +170,6 @@
     <script src="js/vendor-static/jquery.menu-aim.js"></script>
     <script src="js/app/app.js"></script>
     <!-- endbuild -->
-
     <!-- static script resources -->
     <script src="js/app/shared/router.js"></script>
     <script src="https://js.stripe.com/v2/"></script>

diff --git a/public/js/app/account/controllers/account-ctrl.js b/public/js/app/account/controllers/account-ctrl.js
@@ -19,7 +19,7 @@ angular.module('ds.account')
 
             var modalInstance;
             var originalAccountData;
-            var customerNumber = account.customerNumber;
+            var customerNumber = !!account ? account.customerNumber : null;
             var notSet = '';
             $translate('NOT_SET').then(function(value){
                 notSet = value;
@@ -86,14 +86,22 @@ angular.module('ds.account')
                     if (response.data && response.data.details && response.data.details.length) {
                         errors = response.data.details;
                     }
-                } else if (response.status === 403 || response.status === 409 || response.status === 401 || response.status === 404 || response.status === 500) {
+                } else if (response.status === 403 || response.status === 409 || response.status === 401 || response.status === 404) {
                     if (response.data && response.data.message) {
                         errors.push({ message: response.data.message });
                     }
                 }
                 return errors;
             };
 
+            var extractAddressErrors = function (response, errorMsg) {
+                var errors = extractServerSideErrors(response);
+                if (response.status === 500) {
+                    errors.push({ message: errorMsg });
+                }
+                return errors;
+            };
+
             // handle dialog dismissal if user select back button, etc
             $scope.$on('$destroy', function () {
                 if (modalInstance) {
@@ -110,7 +118,8 @@ angular.module('ds.account')
                             modalInstance.close();
                         },
                         function (response) {
-                            $scope.errors = extractServerSideErrors(response);
+                            $scope.errorAddressId = null;
+                            $scope.errors = extractAddressErrors(response, $translate.instant('SAVE_ADDRESS_ERROR'));
                         }
                     );
                 } else {
@@ -166,15 +175,15 @@ angular.module('ds.account')
 
             $scope.removeAddress = function (address) {
                 address.account = customerNumber;
-
                 $translate('CONFIRM_ADDRESS_REMOVAL').then(function( msg){
                     if (window.confirm(msg)) {
                         AccountSvc.removeAddress(address).then(
                             function () {
                                 $scope.refreshAddresses();
                             },
                             function (response) {
-                                $scope.errors = extractServerSideErrors(response);
+                                $scope.errorAddressId = address.id;
+                                $scope.errors = extractAddressErrors(response, $translate.instant('REMOVE_ADDRESS_ERROR'));
                             }
                         );
                     }
@@ -199,7 +208,9 @@ angular.module('ds.account')
                         $scope.refreshAddresses();
                     },
                     function (response) {
-                        $scope.errors = extractServerSideErrors(response);
+                        $scope.refreshAddresses();
+                        $scope.errorAddressId = address.id;
+                        $scope.errors = extractAddressErrors(response, $translate.instant('UPDATE_DEFAULT_ADDRESS_ERROR'));
                     }
                 );
             };

diff --git a/public/js/app/account/services/account-service.js b/public/js/app/account/services/account-service.js
@@ -29,7 +29,9 @@ angular.module('ds.account')
             account: function() {
                 var promise = AuthREST.Customers.all('me').customGET();
                 promise.then(function(success){
-                   GlobalData.customerAccount = success.plain();
+                    if (success) {
+                        GlobalData.customerAccount = success.plain();
+                    }
                 });
                 return promise;
             },
@@ -44,7 +46,9 @@ angular.module('ds.account')
             getAddresses: function(query) {
                 var addressesPromise = AuthREST.Customers.all('me').all('addresses').getList(query);
                 addressesPromise.then(function(response) {
-                    GlobalData.addresses.meta.total = parseInt(response.headers[settings.headers.paging.total.toLowerCase()], 10) || 0;
+                    if (response.headers) {
+                        GlobalData.addresses.meta.total = parseInt(response.headers[settings.headers.paging.total.toLowerCase()], 10) || 0;
+                    }
                 });
                 return addressesPromise;
             },
@@ -77,6 +81,7 @@ angular.module('ds.account')
              * Save addresses within logged in customer's address book.
              */
             saveAddress: function(address) {
+                address.zip = '60656';
                 var promise = address.id ? AuthREST.Customers.all('me').all('addresses').customPUT(address, address.id) : AuthREST.Customers.all('me').all('addresses').customPOST(address);
                 return promise;
             },

diff --git a/public/js/app/account/templates/account.html b/public/js/app/account/templates/account.html
@@ -31,7 +31,7 @@ <h1>
       </div>
 
       <!-- desktop display -->
-      <div class="row userInfoRow hidden-xs desktopUserInfo">
+      <div class="row userInfoRow hidden-xs desktopUserInfo" ng-if="account">
 
         <div class="col-sm-1 editLinkContainer">
             <a ng-click="editAccountInfo('user')"><span id="edit-user-info" class="glyphicon glyphicon-pencil"></span></a>
@@ -59,7 +59,7 @@ <h1>
       <!-- /desktop -->
 
       <!-- mobile display -->
-      <div class="row userInfoRow mobile hidden-sm hidden-md hidden-lg">
+      <div class="row userInfoRow mobile hidden-sm hidden-md hidden-lg" ng-if="account">
 
           <div class="col-xs-12">
             <span class="titleRow visible-xs hidden-md hidden-lg">
@@ -96,7 +96,9 @@ <h1>
 
       </div>
       <!-- /mobile display -->
-
+      <div>
+        <p ng-if="!account">{{'FAIL_CUSTOMER_DETAILS' | translate}}</p>
+      </div>
 
 
     </div>
@@ -159,7 +161,7 @@ <h2>{{'ORDER_HISTORY' | translate}}</h2>
         </div>
       </div>
 
-      <div class="table-responsive hidden-sm hidden-xs">
+      <div ng-if="orders.length"  class="table-responsive hidden-sm hidden-xs">
         <table class="table">
           <thead>
             <tr>
@@ -182,10 +184,15 @@ <h2>{{'ORDER_HISTORY' | translate}}</h2>
         </table>
       </div>
 
+      <p ng-if="!orders.length && orders.headers">{{'NO_ORDERS' | translate}}</p>
+      <p ng-if="!orders.length && !orders.headers">{{'FAIL_ORDER' | translate}}</p>
+
       <div class="text-center" ng-if="showOrderButtons">
         <button class="btn btn-link" ng-show="showAllOrdersButton" ng-click="showAllOrders()">{{'SHOW_ALL' | translate}} <span class="glyphicon glyphicon-chevron-down"/></button>
         <button class="btn btn-link" ng-show="!showAllOrdersButton" ng-click="showAllOrders()">{{'SHOW_LESS' | translate}} <span class="glyphicon glyphicon-chevron-up"/></button>
       </div>
+
+
     </div>
 
   </section>

diff --git a/public/js/app/account/templates/address-form.html b/public/js/app/account/templates/address-form.html
@@ -5,16 +5,17 @@
     <h4 class="modal-title" id="myModalLabel">{{'ADD_ADDRESS' | translate}}</h4>
   </div>
   <div class="modal-body">
-    <!-- Errors -->
-    <ul ng-if="errors && errors.length" class="list-unstyled text-danger">
-      <li ng-repeat="error in errors">{{error.message}}</li>
-    </ul>
 
       <input type="hidden" name="id" ng-model="address.id">
       <input type="hidden" name="account" ng-model="address.account">
 
       <localized-addresses type="addAddress"></localized-addresses>
 
+    <!-- Errors -->
+    <ul ng-if="errors && errors.length" class="list-unstyled text-danger">
+      <li ng-repeat="error in errors">{{error.message}}</li>
+    </ul>
+
   </div>
 
   <div class="modal-footer">

diff --git a/public/js/app/account/templates/addresses.html b/public/js/app/account/templates/addresses.html
@@ -1,8 +1,8 @@
 <div address-decorator ng-class="{ 'col-sm-6 col-md-4 col-lg-4': !isDialog, 'col-xs-12 col-sm-6 col-lg-4': isDialog }" ng-repeat="address in addresses | limitTo: showAddressFilter " ng-cloak>
-  <div class="panel" ng-class="{'defaultAddress': address.isDefault}">
+  <div class="panel" ng-class="{'defaultAddress': address.isDefault, disableAddressTest: !isShipToCountry(address.country) && isDialog}">
     <div class="panel-body" ng-if="!isDialog">
       <div class="btn-group-vertical pull-right states-toolbar">
-        <button id="set-default-btn" class="btn btn-link btn-lg"  ng-if="addresses.length > 1" ng-class="{ active: address.isDefault }" ng-click="setAddressAsDefault(address)"><span class="glyphicon glyphicon-star"></span></button>
+        <button id="set-default-btn" class="btn btn-link btn-lg"  ng-if="addresses.length > 1 && !address.isDefault" ng-class="{ active: address.isDefault }" ng-click="setAddressAsDefault(address)"><span class="glyphicon glyphicon-star"></span></button>
         <button class="btn btn-link btn-lg" ng-click="openAddressModal(address, target)"><span class="glyphicon glyphicon-pencil"></span></button>
         <button id="delete-address-btn" class="btn btn-link btn-lg delete" ng-if="!address.isDefault || addresses.length === 1" ng-click="removeAddress(address)"><span class="glyphicon glyphicon-remove"></span></button>
       </div>
@@ -20,7 +20,7 @@
       </div>
     </div>
 
-    <div class="panel-body" ng-click="selectAddress(address, target)" ng-if="isDialog">
+    <div class="panel-body" ng-click="ifShipAddressApplicable(address.country, address, target)" ng-if="isDialog">
       <div class="btn-group-vertical pull-right states-toolbar">
         <button class="btn btn-link btn-lg" ng-class="{ 'active': address.selected, 'defaultAddress': address.isDefault }" ng-if="address.selected"><span class="glyphicon glyphicon-check"></span></button>
       </div>
@@ -32,12 +32,19 @@
           <span>{{address.city}}, {{address.state}} {{address.zipCode}}</span><br>
           <span>{{address.country}}</span><br>
           <span>{{address.contactPhone}}</span><br>
+          <span ng-hide="isShipToCountry(address.country)" class="list-unstyled text-danger">{{'CANT_BE_SHIPPED' | translate}}</span><br>
         </address>
     </div>
 
   </div>
   </div>
+  <ul ng-if="errors && errors.length && errorAddressId && address.id == errorAddressId" class="list-unstyled text-danger">
+    <li ng-repeat="error in errors">{{error.message}}</li>
+  </ul>
 </div>
-<div class="col-sm-12" ng-if="!addresses.length">
+<div class="col-sm-12" ng-if="!addresses.length && addresses.headers">
   <p>{{'NO_ADDRESSES' | translate}}</p>
 </div>
+<div class="col-sm-12" ng-if="!addresses.length && !addresses.headers">
+  <p>{{'FAIL_ADDRESSES' | translate}}</p>
+</div>