1.0.7

Author: Dana Roibu

.gitignore

@@ -8,7 +8,6 @@ public/css/vendor
 *.iml
 public/css/app/style.css
 public/css/app/style.css.map
-public/js/app/shared/app-config.
 public/js/app/shared/i18n/lang/*.json
 .idea
 coverage/

bower.json

@@ -15,10 +15,10 @@
   ],
   "dependencies": {
     "jquery": "latest",
-    "angular": "~1.3.0",
+    "angular": "~1.5.9",
     "angular-resource": "latest",
     "angular-ui-router": "~0.2.11",
-    "angular-mocks": "~1.3.0",
+    "angular-mocks": "~1.5.9",
     "angular-translate": "~2.8.0",
     "angular-translate-loader-static-files": "~2.8.1",
     "angular-stripe-js": "Venturocket/angular-stripe-js#0.0.6",
@@ -27,15 +27,17 @@
     "restangular": "~1.4.0",
     "lodash": "~2.4.1",
     "spin.js": "~2.0.1",
+    "angular-animate": "~1.5.9",
     "angular-cookie": "~4.0.2",
-    "angular-bootstrap": "~0.11.0",
+    "angular-bootstrap": "^2.3.0",
     "angular-xeditable": "~0.1.8",
-    "angular-ui-select": "~0.13.2",
-    "angular-sanitize": "~1.3.0",
-    "angular-touch": "~1.3.0",
+    "angular-ui-select": "~0.19.6",
+    "angular-sanitize": "~1.5.9",
+    "angular-touch": "~1.5.9",
     "algoliasearch": "2.9.2",
     "yamm3": "1.1.0",
-    "angular-ui-notification": "^0.2.0"
+    "angular-ui-notification": "^0.2.0",
+    "angular-moment": "^1.0.0"
   },
   "install": {
     "path": {
@@ -44,6 +46,6 @@
     }
   },
   "resolutions": {
-    "angular": "~1.3.0"
+    "angular": "~1.5.9"
   }
 }

config/karma.conf.js

@@ -4,14 +4,13 @@ module.exports = function(config){
 
     files : [
 
+        './node_modules/phantomjs-polyfill/bind-polyfill.js',
+
         'public/js/vendor-static/jquery.min.js',
         'public/js/vendor/lodash/dist/lodash.compat.min.js',
-        'public/js/vendor-static/bootstrap.min.js',
+        'public/js/vendor/bootstrap/dist/js/bootstrap.min.js',
         'public/js/vendor/spin.js/spin.js',
         'public/js/vendor-static/owl.carousel.min.js',
-        'public/js/vendor-static/img-touch-canvas.js',
-        'public/js/vendor-static/jquery.fullscreen-min.js',
-        'public/js/vendor-static/main.js',
         'https://js.stripe.com/v2/',
         'public/js/vendor/angular/angular.min.js',
         'public/js/vendor/angular-touch/angular-touch.js',
@@ -28,7 +27,11 @@ module.exports = function(config){
         'public/js/vendor/angular-sanitize/angular-sanitize.js',
         'public/js/vendor/angular-ui-select/dist/select.min.js',
         'public/js/vendor/angular-ui-notification/dist/angular-ui-notification.min.js',
+        'public/js/vendor/angular-bootstrap/ui-bootstrap-tpls.js',
+        'public/js/vendor/angular-animate/angular-animate.js',
         'public/js/vendor/algoliasearch/dist/algoliasearch.angular.js',
+        'public/js/vendor/moment/min/moment-with-locales.min.js',
+        'public/js/vendor/angular-moment/angular-moment.min.js',
 
         // dummy config/bootstrap for testing
         'test/unit/bootstrap-test.js',
@@ -42,6 +45,7 @@ module.exports = function(config){
         'public/js/app/shared/filters/filters.js',
         'public/js/app/shared/filters/show-number-of-items-filter.js',
         'public/js/app/shared/filters/sum-by-key-filter.js',
+		'public/js/app/shared/services/yrn-svc.js',
         'public/js/app/shared/services/global-data.js',
         'public/js/app/shared/services/site-settings-rest.js',
         'public/js/app/shared/services/configuration-service.js',
@@ -53,6 +57,10 @@ module.exports = function(config){
         '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/directives/product-variants/variant-options-ctrl.js',
+        'public/js/app/shared/directives/product-variants/variant-options-svc.js',
+        'public/js/app/shared/directives/product-variants/variant-options-dir.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',
@@ -85,6 +93,7 @@ module.exports = function(config){
         'public/js/app/products/services/category-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-variants-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',
@@ -167,9 +176,13 @@ module.exports = function(config){
         'public/js/app/orders/services/order-list-service.js',
         'public/js/app/orders/services/orders-rest.js',
 
+        'public/js/app/fees/fee-index.js',
+        'public/js/app/fees/services/fee-rest.js',
+        'public/js/app/fees/services/fee-service.js',
+        'public/js/app/fees/directives/product-fees.js',
+
         'public/js/app/app.js',
 
-        'public/js/vendor-static/ui-bootstrap-tpls.js',
         'public/js/vendor-static/jquery.menu-aim.js',
 
         'test/unit/*.js',
@@ -187,7 +200,8 @@ module.exports = function(config){
         'test/unit/products/*.js',
         'test/unit/search/*.js',
         'test/unit/shared/**/*.js',
-        'test/unit/shipping/**/*.js'
+        'test/unit/shipping/**/*.js',
+        'test/unit/fees/*.js'
 
     ],
 
@@ -228,4 +242,4 @@ module.exports = function(config){
       suite: 'unit'
     }
 
-})}
+})};

package.json

@@ -15,11 +15,11 @@
     "singleProd": "node node_modules/grunt-cli/bin/grunt singleProject:prod",
     "singleProdEU": "node node_modules/grunt-cli/bin/grunt singleProject:prod --region=eu",
     "multiTest": "node node_modules/grunt-cli/bin/grunt multiProject:test",
-    "multiStage": "node node_modules/grunt-cli/bin/grunt multiProject:stage",
+    "multiStage": "node node_modules/grunt-cli/bin/grunt multiProject:stage --force",
     "multiProd": "node node_modules/grunt-cli/bin/grunt multiProject:prod",
     "multiProdHttps": "node node_modules/grunt-cli/bin/grunt multiProject:prod --https",
     "multiProdHttpsEU": "node node_modules/grunt-cli/bin/grunt multiProject:prod --https --region=eu",
-    "multiStageHttps": "node node_modules/grunt-cli/bin/grunt multiProject:stage --https",
+    "multiStageHttps": "node node_modules/grunt-cli/bin/grunt multiProject:stage --https --force",
     "prepareProd": "node node_modules/grunt-cli/bin/grunt prepareBuild:prod",
     "prepareProdEU": "node node_modules/grunt-cli/bin/grunt prepareBuild:prod --region=eu",
     "prepareTest": "node node_modules/grunt-cli/bin/grunt prepareBuild:test",
@@ -77,6 +77,7 @@
     "karma-script-launcher": "~0.1.0",
     "phantomcss": "^0.4.5",
     "phantomjs": "~2.1.3",
+    "phantomjs-polyfill": "0.0.2",
     "phantomjs-prebuilt": "~2.1.4",
     "protractor": "^1.8.0",
     "protractor-screenshot-reporter": "0.0.5",

public/css/app/style.css.map

@@ -41,6 +41,7 @@
     <!-- dynamic optimized script resources -->
     <!-- build:js js/storefront.js -->
     <script src="js/vendor-static/jquery.min.js"></script>
+    <script src="js/vendor/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="js/vendor/angular/angular.js"></script>
     <script src="js/vendor/angular-mocks/angular-mocks.js"></script>
     <script src="js/vendor/angular-touch/angular-touch.js"></script>
@@ -58,6 +59,8 @@
     <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/angular-ui-notification/dist/angular-ui-notification.min.js"></script>
+    <script src="js/vendor/moment/min/moment-with-locales.min.js"></script>
+    <script src="js/vendor/angular-moment/angular-moment.min.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>
@@ -79,6 +82,7 @@
     <script src="js/app/shared/directives/stop-event.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/yrn-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>
@@ -89,6 +93,9 @@
     <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/directives/product-variants/variant-options-ctrl.js"></script>
+    <script src="js/app/shared/directives/product-variants/variant-options-svc.js"></script>
+    <script src="js/app/shared/directives/product-variants/variant-options-dir.js"></script>
 
     <script src="js/app/shared/controllers/sidebar-navigation-ctrl.js"></script>
     <script src="js/app/shared/controllers/top-navigation-ctrl.js"></script>
@@ -122,6 +129,9 @@
     <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/directives/price-label/price-label.js"></script>
+    <script src="js/app/products/filters/date-with-locale-filters.js"></script>
+	<script src="js/app/products/utils/product-variants-helper.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>
@@ -189,10 +199,16 @@
     <script src="js/app/auth/services/auth-dialog-manager.js"></script>
     <script src="js/app/search/search-index.js"></script>
     <script src="js/app/search/controllers/search-list-ctrl.js"></script>
+    <script src="js/app/fees/fee-index.js"></script>
+    <script src="js/app/fees/services/fee-rest.js"></script>
+    <script src="js/app/fees/services/fee-service.js"></script>
+    <script src="js/app/fees/directives/product-fees.js"></script>
+
     <script src="js/app/errors/backendStub.js"></script>
-    <script src="js/vendor-static/bootstrap.min.js"></script>
     <script src="js/vendor/bootstrap/js/popover.js"></script>
     <script src="js/app/shared/directives/popover.js"></script>
+    <script src="js/app/shared/directives/refine-affix.js"></script>
+    <script src="js/vendor/angular-animate/angular-animate.js"></script>
     <script src="js/vendor/angular-bootstrap/ui-bootstrap-tpls.js"></script>
     <script src="js/vendor-static/jquery.menu-aim.js"></script>
     <script src="js/app/app.js"></script>

public/index.html

@@ -13,9 +13,9 @@
 
 angular.module('ds.account')
 
-    .controller('AccountCtrl', ['$scope', 'addresses', 'account', 'orders', 'OrderListSvc', 'AccountSvc', '$modal', 'GlobalData', '$translate',
+    .controller('AccountCtrl', ['$scope', 'addresses', 'account', 'orders', 'OrderListSvc', 'AccountSvc', '$uibModal', 'GlobalData', '$translate',
 
-        function ($scope, addresses, account, orders, OrderListSvc, AccountSvc, $modal, GlobalData, $translate) {
+        function ($scope, addresses, account, orders, OrderListSvc, AccountSvc, $uibModal, GlobalData, $translate) {
 
             var self = this;
             self.allOrdersLoaded = false;
@@ -116,7 +116,7 @@ angular.module('ds.account')
                 });
                 $scope.showPristineErrors = false;
                 $scope.errors = [];
-                modalInstance = $modal.open({
+                modalInstance = $uibModal.open({
                     templateUrl: './js/app/account/templates/address-form.html',
                     scope: $scope,
                     backdrop: 'static'
@@ -141,7 +141,7 @@ angular.module('ds.account')
             $scope.removeAddress = function (address) {
                 address.account = customerNumber;
 
-                $modal.open({
+                $uibModal.open({
                     templateUrl: 'js/app/account/templates/dialogs/address-remove-dialog.html',
                     controller: 'AddressRemoveDialogCtrl'
                 }).result.then(function (deleteAddress) {

public/js/app/account/controllers/account-ctrl.js

@@ -13,8 +13,8 @@
 'use strict';
 
 angular.module('ds.account')
-    .controller('AccountOrderDetailCtrl', ['$scope', 'order', '$stateParams', 'GlobalData', '$modal',
-        function($scope, order, $stateParams, GlobalData, $modal) {
+    .controller('AccountOrderDetailCtrl', ['$scope', 'order', '$stateParams', 'GlobalData', '$uibModal',
+        function($scope, order, $stateParams, GlobalData, $uibModal) {
 
         $scope.order = order;
         $scope.order.id = $stateParams.orderId;
@@ -40,7 +40,7 @@ angular.module('ds.account')
         $scope.payment = getPaymentInfo();
 
         $scope.cancelOrder = function () {
-            $modal.open({
+            $uibModal.open({
                 templateUrl: 'js/app/account/templates/dialogs/order-cancel-dialog.html',
                 controller: 'OrderCancelDialogCtrl',
                 backdrop: 'static',

public/js/app/account/controllers/account-order-detail-ctrl.js

@@ -13,15 +13,15 @@
     'use strict';
 
     angular.module('ds.account')
-        .controller('AddressRemoveDialogCtrl', ['$scope', '$modalInstance',
-            function ($scope, $modalInstance) {
+        .controller('AddressRemoveDialogCtrl', ['$scope', '$uibModalInstance',
+            function ($scope, $uibModalInstance) {
 
                 $scope.delete = function () {
-                    $modalInstance.close(true);
+                    $uibModalInstance.close(true);
                 };
 
                 $scope.close = function () {
-                    $modalInstance.dismiss('cancel');
+                    $uibModalInstance.dismiss('cancel');
                 };
 
             }]);

public/js/app/account/controllers/dialogs/address-remove-dialog-ctrl.js

@@ -15,8 +15,8 @@ angular.module('ds.account')
     /**
      *  Displays the "Delete Account" modal dialog.
      */
-    .controller('DeleteAccountDialogCtrl', ['$scope', 'AccountSvc', '$modalInstance', 'AuthDialogManager',
-        function($scope, AccountSvc, $modalInstance, AuthDialogManager) {
+    .controller('DeleteAccountDialogCtrl', ['$scope', 'AccountSvc', '$uibModalInstance', 'AuthDialogManager',
+        function($scope, AccountSvc, $uibModalInstance, AuthDialogManager) {
 
             $scope.submitDisabled = false;
             $scope.showError = false;
@@ -26,7 +26,7 @@ angular.module('ds.account')
 
                 AccountSvc.deleteAccount().then(
                     function() {
-                        $modalInstance.close();
+                        $uibModalInstance.close();
                         AuthDialogManager.showDeleteAccountConfirmRequest();
                     },
                     function(){
@@ -37,7 +37,7 @@ angular.module('ds.account')
             };
 
             $scope.close = function() {
-                $modalInstance.dismiss('cancel');
+                $uibModalInstance.dismiss('cancel');
             };
 
     }]);