1.0.5

ConUHacks · Jul 29, 2016 · 65e19a4 · 65e19a4
1 parent 074c6f5
commit 65e19a4
Show file tree

Hide file tree

Showing 116 changed files with 4,698 additions and 2,089 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@ coverage/
 config/config.js
 dist
 .DS_Store
-.vscode
+.vscode
+typings/
diff --git a/config/karma.conf.js b/config/karma.conf.js
@@ -82,7 +82,12 @@ module.exports = function(config){
         'public/js/app/products/services/price-service.js',
         'public/js/app/products/services/price-product-rest.js',
         'public/js/app/products/services/category-service.js',
-        'public/js/app/products/services/product-attribute-service.js',
+        'public/js/app/products/services/product-extension-service.js',
+        'public/js/app/products/utils/product-extension-helper.js',
+        'public/js/app/products/utils/product-extension-item-helper.js',
+        'public/js/app/products/utils/product-factory.js',
+        'public/js/app/products/options/product-options-helper.js',
+        'public/js/app/products/options/product-options.js',
 
         'public/js/app/cart/cart-index.js',
         'public/js/app/cart/controllers/cart-ctrl.js',
@@ -123,6 +128,7 @@ module.exports = function(config){
         'public/js/app/account/controllers/account-ctrl.js',
         'public/js/app/account/controllers/account-order-detail-ctrl.js',
         'public/js/app/account/controllers/dialogs/address-remove-dialog-ctrl.js',
+        'public/js/app/account/controllers/dialogs/order-cancel-dialog-ctrl.js',
         'public/js/app/account/controllers/modals/edit-user-email-dialog-ctrl.js',
         'public/js/app/account/controllers/modals/edit-user-name-dialog-ctrl.js',
         'public/js/app/account/directives/customer-details/customer-details-directive.js',

diff --git a/config/protractor-conf.js b/config/protractor-conf.js
@@ -7,12 +7,12 @@ exports.config = {
     sauceKey: process.env.SAUCE_ACCESS_KEY,
 
     specs: [
-
-        '../test/e2e/cart-tests.js',
-        '../test/e2e/checkout-tests.js',
-        '../test/e2e/coupon-tests.js',
-        '../test/e2e/login-tests.js',
-        '../test/e2e/product-tests.js'
+        '../test/e2e/cart/cart.spec.js',
+        '../test/e2e/checkout/checkout.desktop.spec.js',
+        '../test/e2e/checkout/checkout.mobile.spec.js',
+        '../test/e2e/coupon/coupon.spec.js',
+        '../test/e2e/account/account.spec.js',
+        '../test/e2e/product/product.spec.js'
     ],
 
 
@@ -56,7 +56,6 @@ exports.config = {
 
     baseUrl: 'https://storefront-demo.yaas.io/',
 
-
     framework: 'jasmine',
 
     jasmineNodeOpts: {

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "grunt-contrib-watch": "0.5.3",
     "grunt-env": "latest",
     "grunt-express": "~1.3.5",
-    "grunt-karma": "~0.8.3",
+    "grunt-karma": "~2.0.0",
     "grunt-ngmin": "~0.0.2",
     "grunt-rev": "~0.1.0",
     "grunt-text-replace": "0.4.0",
@@ -59,7 +59,7 @@
     "grunt-json-minify": "^0.4.0",
     "istanbul": "0.3.0",
     "jasmine-reporters": "^1.0.0",
-    "karma": "^0.12.31",
+    "karma": "~0.13.22",
     "karma-chrome-launcher": "~0.1.3",
     "karma-coffee-preprocessor": "^0.1.3",
     "karma-coverage": "~0.2.1",
@@ -70,7 +70,8 @@
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-script-launcher": "~0.1.0",
     "phantomcss": "^0.4.5",
-    "phantomjs": "^1.9.15",
+    "phantomjs": "~2.1.3",
+    "phantomjs-prebuilt": "~2.1.4",
     "protractor": "^1.8.0",
     "protractor-screenshot-reporter": "0.0.5",
     "resemblejs": "^1.0.1",

diff --git a/public/index.html b/public/index.html
@@ -95,6 +95,7 @@
     <script src="js/app/shared/filters/filters.js"></script>
     <script src="js/app/shared/filters/show-number-of-items-filter.js"></script>
     <script src="js/app/shared/filters/sum-by-key-filter.js"></script>
+    <script src="js/app/shared/filters/date-filters.js"></script>
     <script src="js/app/shared/i18n/i18-index.js"></script>
     <script src="js/app/shared/i18n/i18-constants.js"></script>
     <script src="js/app/shared/i18n/providers/translation-provider.js"></script>
@@ -116,11 +117,15 @@
     <script src="js/app/products/services/price-service.js"></script>
     <script src="js/app/products/services/price-product-rest.js"></script>
     <script src="js/app/products/services/category-service.js"></script>
-    <script src="js/app/products/services/product-attribute-service.js"></script>
-    <script src="js/app/products/directives/product-attribute-groups.js"></script>
-    <script src="js/app/products/directives/product-attribute-group.js"></script>
-    <script src="js/app/products/directives/product-attribute.js"></script>
+    <script src="js/app/products/services/product-extension-service.js"></script>
     <script src="js/app/products/directives/product-img-carousel.js"></script>
+    <script src="js/app/products/directives/product-extension.js"></script>
+    <script src="js/app/products/directives/product-extension-item.js"></script>
+    <script src="js/app/products/utils/product-extension-helper.js"></script>
+    <script src="js/app/products/utils/product-extension-item-helper.js"></script>
+    <script src="js/app/products/utils/product-factory.js"></script>
+    <script src="js/app/products/options/product-options-helper.js"></script>
+    <script src="js/app/products/options/product-options.js"></script>
     <script src="js/app/errors/controllers/errors-ctrl.js"></script>
     <script src="js/app/cart/cart-index.js"></script>
     <script src="js/app/cart/controllers/cart-ctrl.js"></script>
@@ -158,6 +163,7 @@
     <script src="js/app/account/controllers/account-order-detail-ctrl.js"></script>
     <script src="js/app/account/controllers/change-email-confirmation-ctrl.js"></script>
     <script src="js/app/account/controllers/dialogs/address-remove-dialog-ctrl.js"></script>
+    <script src="js/app/account/controllers/dialogs/order-cancel-dialog-ctrl.js"></script>
     <script src="js/app/account/controllers/modals/edit-user-name-dialog-ctrl.js"></script>
     <script src="js/app/account/controllers/modals/edit-user-email-dialog-ctrl.js"></script>
     <script src="js/app/account/directives/customer-details/customer-details-ctrl.js"></script>

diff --git a/public/js/app/account/controllers/account-ctrl.js b/public/js/app/account/controllers/account-ctrl.js
@@ -17,6 +17,8 @@ angular.module('ds.account')
 
         function ($scope, addresses, account, orders, OrderListSvc, AccountSvc, $modal, GlobalData, $translate) {
 
+            var self = this;
+            self.allOrdersLoaded = false;
             var modalInstance;
             var customerNumber = !!account ? account.customerNumber : null;
 
@@ -185,30 +187,27 @@ angular.module('ds.account')
                 $scope.showAllOrdersButton = !$scope.showAllOrdersButton;
 
                 var parms = {
-                    pageSize: 100
+                    pageSize: GlobalData.orders.meta.total
                 };
-                OrderListSvc.query(parms).then(function (orders) {
-                    $scope.orders = orders;
-
-                    // show filtered list or show all orders. Hide if all data is shown within filter.
+                if (self.allOrdersLoaded) {
                     $scope.showOrdersFilter = $scope.showAllOrdersButton ? $scope.showOrdersDefault : $scope.orders.length;
                     $scope.showOrderButtons = ($scope.orders.length > $scope.showOrdersDefault);
-                });
+                } else {
+                    OrderListSvc.query(parms).then(function (orders) {
+                        $scope.orders = orders;
+
+                        // show filtered list or show all orders. Hide if all data is shown within filter.
+                        $scope.showOrdersFilter = $scope.showAllOrdersButton ? $scope.showOrdersDefault : $scope.orders.length;
+                        $scope.showOrderButtons = ($scope.orders.length > $scope.showOrdersDefault);
+                        self.allOrdersLoaded = true;
+                    });
+                }
             };
 
             $scope.showAllAddresses = function () {
                 $scope.showAllAddressButton = !$scope.showAllAddressButton;
-
-                var parms = {
-                    pageSize: GlobalData.addresses.meta.total
-                };
-                AccountSvc.getAddresses(parms).then(function (addresses) {
-                    $scope.addresses = addresses;
-
-                    // show filtered list or show all addresses. Hide if all data is shown within filter.
-                    $scope.showAddressFilter = $scope.showAllAddressButton ? $scope.showAddressDefault : $scope.addresses.length;
-                    $scope.showAddressButtons = ($scope.addresses.length > $scope.showAddressDefault);
-                });
+                $scope.showAddressFilter = $scope.showAllAddressButton ? $scope.showAddressDefault : $scope.addresses.length;
+                $scope.showAddressButtons = ($scope.addresses.length > $scope.showAddressDefault);
             };
 
             /*

diff --git a/public/js/app/account/controllers/account-order-detail-ctrl.js b/public/js/app/account/controllers/account-order-detail-ctrl.js
@@ -13,7 +13,8 @@
 'use strict';
 
 angular.module('ds.account')
-    .controller('AccountOrderDetailCtrl', ['$scope', 'order', '$stateParams', 'GlobalData', function($scope, order, $stateParams, GlobalData) {
+    .controller('AccountOrderDetailCtrl', ['$scope', 'order', '$stateParams', 'GlobalData', '$modal',
+        function($scope, order, $stateParams, GlobalData, $modal) {
 
         $scope.order = order;
         $scope.order.id = $stateParams.orderId;
@@ -38,4 +39,27 @@ angular.module('ds.account')
 
         $scope.payment = getPaymentInfo();
 
+        $scope.cancelOrder = function () {
+            $modal.open({
+                templateUrl: 'js/app/account/templates/dialogs/order-cancel-dialog.html',
+                controller: 'OrderCancelDialogCtrl',
+                backdrop: 'static',
+                resolve: {
+                    order: function () {
+                        return order;
+                    }
+                }
+            }).result.then(function (response) {
+                $scope.order.status = response.status;
+            });
+        };
+
+        $scope.showCancelBtn = function (order) {
+            if (!!order.status && (order.status === 'CREATED' || order.status === 'CONFIRMED')) {
+                return true;
+            } else {
+                return false;
+            }
+        };
+
     }]);
diff --git a/public/js/app/account/controllers/dialogs/order-cancel-dialog-ctrl.js b/public/js/app/account/controllers/dialogs/order-cancel-dialog-ctrl.js
@@ -0,0 +1,34 @@
+/**
+ * [y] hybris Platform
+ *
+ * Copyright (c) 2000-2016 hybris AG
+ * All rights reserved.
+ *
+ * This software is the confidential and proprietary information of hybris
+ * ("Confidential Information"). You shall not disclose such Confidential
+ * Information and shall use it only in accordance with the terms of the
+ * license agreement you entered into with hybris.
+ */
+(function () {
+    'use strict';
+
+    angular.module('ds.account')
+        .controller('OrderCancelDialogCtrl', ['$scope', '$modalInstance', 'order', 'OrderDetailSvc', '$translate',
+            function ($scope, $modalInstance, order, OrderDetailSvc, $translate) {
+
+                $scope.orderCancelError = '';
+
+                $scope.cancelOrder = function () {
+                    OrderDetailSvc.cancelOrder(order.id).then(function (response) {
+                        $modalInstance.close({status: response.status});
+                    }, function () {
+                        $scope.orderCancelError = $translate.instant('ORDER_CANCEL_ERROR');
+                    });
+                };
+
+                $scope.closeCancelOrderDialog = function () {
+                    $modalInstance.dismiss('cancel');
+                };
+
+            }]);
+})();
diff --git a/public/js/app/account/directives/customer-details/customer-details-ctrl.js b/public/js/app/account/directives/customer-details/customer-details-ctrl.js
@@ -14,8 +14,8 @@
     'use strict';
 
     angular.module('ds.account')
-        .controller('CustomerDetailsCtrl', ['$scope', 'AuthDialogManager', '$modal',
-            function ($scope, AuthDialogManager, $modal) {
+        .controller('CustomerDetailsCtrl', ['$scope', 'AuthDialogManager', '$modal', 'AccountSvc',
+            function ($scope, AuthDialogManager, $modal, AccountSvc) {
 
                 $scope.modalInstance = {};
 
@@ -55,6 +55,8 @@
                     AuthDialogManager.showUpdatePassword();
                 };
 
+                $scope.isItSocialAccount = AccountSvc.isItSocialAccount($scope.account);
+
                 // handle dialog dismissal if user select back button, etc
                 $scope.$on('$destroy', function () {
                     if ($scope.modalInstance && $scope.modalInstance.dismiss) {

diff --git a/public/js/app/account/directives/customer-details/customer-details.html b/public/js/app/account/directives/customer-details/customer-details.html
@@ -26,24 +26,25 @@ <h1>
             <div class="col-sm-1 editLinkContainer">
                 <a ng-click="editUserName(account)"><span id="edit-user-info" class="glyphicon glyphicon-pencil"></span></a>
             </div>
-            <div class="col-sm-3 col-md-3">
+            <div id="account-name" class="col-sm-3 col-md-3">
                 <span class="dataLabel">{{'NAME' | translate}}</span>
                 {{account.title|translate}} {{account.firstName}} {{account.middleName}} {{account.lastName}}
             </div>
             <div class="col-sm-1 editLinkContainer">
-                <a ng-click="editUserEmail(account)"><span id="update-email" class="glyphicon glyphicon-pencil"></span></a>
+                <a ng-click="editUserEmail(account)" ng-hide="isItSocialAccount"><span id="update-email" class="glyphicon glyphicon-pencil"></span></a>
             </div>
-            <div class="col-sm-3">
+            <div id="account-contact-email" class="col-sm-3">
                 <span class="dataLabel">{{'EMAIL' | translate}}</span>
                 {{account.contactEmail}}
             </div>
-
-            <div class="col-sm-1 editLinkContainer">
-                <a ng-click="updatePassword()"><span id="update-password" class="glyphicon glyphicon-pencil"></span></a>
-            </div>
-            <div class="col-sm-3">
-                <span class="dataLabel">{{'PASSWORD' | translate}}</span>
-                &#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;
+            <div ng-hide="isItSocialAccount">
+                <div class="col-sm-1 editLinkContainer">
+                    <a ng-click="updatePassword()"><span id="update-password" class="glyphicon glyphicon-pencil"></span></a>
+                </div>
+                <div class="col-sm-3">
+                    <span class="dataLabel">{{'PASSWORD' | translate}}</span>
+                    &#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;
+                </div>
             </div>
         </div>
         <!-- /desktop -->
@@ -66,17 +67,19 @@ <h1>
                     {{account.contactEmail}}
                 </div>
             </div>
-            <div class="col-xs-4">
+            <div class="col-xs-4" ng-hide="isItSocialAccount">
                 <button class="btn btn-secondary btn-md pull-right" ng-click="editUserEmail(account)">{{'EDIT' | translate}}</button>
             </div>
-            <div class="col-xs-8">
-                <div class="mobileDataSection">
-                    <span class="dataLabel">{{'PASSWORD' | translate}}</span>
-                    &#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;
+            <div ng-hide="isItSocialAccount">
+                <div class="col-xs-8">
+                    <div class="mobileDataSection">
+                        <span class="dataLabel">{{'PASSWORD' | translate}}</span>
+                        &#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;
+                    </div>
+                </div>
+                <div class="col-xs-4">
+                    <button class="btn btn-secondary btn-md pull-right" ng-click="updatePassword()">{{'EDIT' | translate}}</button>
                 </div>
-            </div>
-            <div class="col-xs-4">
-                <button class="btn btn-secondary btn-md pull-right" ng-click="updatePassword()">{{'EDIT' | translate}}</button>
             </div>
 
         </div>

diff --git a/public/js/app/account/services/account-service.js b/public/js/app/account/services/account-service.js
@@ -43,13 +43,8 @@ angular.module('ds.account')
             /**
              * Retrieve addresses of logged in customer.
              */
-            getAddresses: function(query) {
-                var addressesPromise = AuthREST.Customers.all('me').all('addresses').getList(query);
-                addressesPromise.then(function(response) {
-                    if (response.headers) {
-                        GlobalData.addresses.meta.total = parseInt(response.headers[settings.headers.paging.total.toLowerCase()], 10) || 0;
-                    }
-                });
+            getAddresses: function() {
+                var addressesPromise = AuthREST.Customers.all('me').all('addresses').getList();
                 return addressesPromise;
             },
 
@@ -134,6 +129,17 @@ angular.module('ds.account')
                     token: token
                 };
                 return AuthREST.Customers.all('me').all('accounts').all('internal').all('email').all('change').customPOST(data, 'confirm');
+            },
+
+            isItSocialAccount: function (account) {
+                if (!!account) {
+                    for (var i = 0; i < account.accounts.length; i++) {
+                        if (account.accounts[i].providerId === 'google' || account.accounts[i].providerId === 'facebook') {
+                            return true;
+                        }
+                    }
+                }
+                return false;
             }
 
         };

diff --git a/public/js/app/account/templates/account.html b/public/js/app/account/templates/account.html
@@ -63,7 +63,7 @@ <h2>{{'ORDER_HISTORY' | translate}}</h2>
                             <p>{{m_order.totalPrice | currency: m_order.currencySymbol}}</p>
                         </div>
                         <div class="col-sm-4 col-xs-4">
-                          <p><strong>{{m_order.status}}</strong></p>
+                          <p><strong>{{m_order.status | translate}}</strong></p>
                         </div>
                     </div>
                 </div>
@@ -83,12 +83,12 @@ <h2>{{'ORDER_HISTORY' | translate}}</h2>
             </tr>
           </thead>
           <tbody>
-              <tr ng-repeat="xrder in orders | limitTo: showOrdersFilter ">
-                  <td>{{xrder.created | date: 'medium'}}</td>
-                  <td><a ui-sref="base.orderDetail({orderId: xrder.id})">{{xrder.id}}</a></td>
-                  <td>{{xrder.entries|sumByKey:'amount'|showNoOfItems}}</td>
-                  <td>{{xrder.totalPrice | currency: xrder.currencySymbol}}</td>
-                  <td><strong>{{xrder.status}}</strong></td>
+              <tr ng-repeat="orderRow in orders | limitTo: showOrdersFilter ">
+                  <td>{{orderRow.created | date: 'medium'}}</td>
+                  <td><a ui-sref="base.orderDetail({orderId: orderRow.id})">{{orderRow.id}}</a></td>
+                  <td>{{orderRow.entries|sumByKey:'amount'|showNoOfItems}}</td>
+                  <td>{{orderRow.totalPrice | currency: orderRow.currencySymbol}}</td>
+                  <td><strong>{{orderRow.status | translate}}</strong></td>
               </tr>
           </tbody>
         </table>