Merge pull request #16 from plentymarkets/scheduler

set scheduler in checkout
plentymarkets · Feb 13, 2017 · 6a18b53 · 6a18b53
2 parents 1cb7fd0 + 51738c2
commit 6a18b53
Show file tree

Hide file tree

Showing 10 changed files with 386 additions and 17 deletions.
diff --git a/dist/plentymarketsCMStools-1.0.17.min.js b/dist/plentymarketsCMStools-1.0.17.min.js
diff --git a/dist/plentymarketsCMStools-1.0.17.min.js.map b/dist/plentymarketsCMStools-1.0.17.min.js.map
diff --git a/dist/plentymarketsCMStools-1.0.17.js → dist/plentymarketsCMStools-1.0.18.js b/dist/plentymarketsCMStools-1.0.17.js → dist/plentymarketsCMStools-1.0.18.js
@@ -106,7 +106,7 @@ TemplateCache["waitscreen/waitscreen.html"] = "<div id=\"PlentyWaitScreen\" clas
 (function( $ )
 {
     // will be overridden by grunt
-    var version = "1.0.17";
+    var version = "1.0.18";
 
     /**
      * Collection of uncompiled registered factories & services.
@@ -846,10 +846,15 @@ TemplateCache["waitscreen/waitscreen.html"] = "<div id=\"PlentyWaitScreen\" clas
             pm.getRecentEvent().preventDefault();
             //init
             var basketItemsList = {};
+            var scheduler       = {};
             var $elem           = $( elem );
             var parentForm      = $elem.parents( 'form' );
             var $p_id           = parentForm.find( '[name="P_ID"]:checked' );
 
+            scheduler.SchedulerInterval = parentForm.find( '[name="scheduler_interval"]' ).val();
+            scheduler.SchedulerRepeating = parentForm.find( '[name="scheduler_repeating"]' ).val();
+            scheduler.SchedulerDate = parentForm.find( '[name="scheduler_dateselector"]' ).val();
+
             basketItemsList.BasketItemItemID   = parentForm.find( '[name="ArticleID"]' ).val();
             basketItemsList.BasketItemPriceID  = parentForm.find( '[name="SYS_P_ID"]' ).val();
             basketItemsList.BasketItemQuantity = parentForm.find( '[name^="ArticleQuantity"]' ).val();
@@ -883,6 +888,12 @@ TemplateCache["waitscreen/waitscreen.html"] = "<div id=\"PlentyWaitScreen\" clas
                 basketItemsList.BasketItemAttributesList = attributesList;
             }
 
+            if(typeof scheduler.SchedulerInterval !== "undefined"
+                && scheduler.SchedulerInterval > 0)
+            {
+                BasketService.setScheduler( scheduler );
+            }
+
             //add basketItem and refresh previewLists
             BasketService.addItem( [basketItemsList] );
 
@@ -3899,7 +3910,8 @@ PlentyFramework.cssClasses = {
             editItemAttributes: editItemAttributes,
             editOrderParams   : editOrderParams,
             addCoupon         : addCoupon,
-            removeCoupon      : removeCoupon
+            removeCoupon      : removeCoupon,
+            setScheduler      : setScheduler
         };
 
         /**
@@ -4538,6 +4550,22 @@ PlentyFramework.cssClasses = {
             }
         }
 
+        /**
+         * Set scheduler in checkout.
+         * @function setScheduler
+         * @param   {Array}     scheduler         Array containing the scheduler data
+         * @return {object} <a href="http://api.jquery.com/category/deferred-object/" target="_blank">jQuery deferred
+         *     Object</a>
+         */
+        function setScheduler(scheduler)
+        {
+            return API.put("/rest/checkout/scheduler", scheduler)
+                .done( function()
+                {
+                    updateContainer();
+                } );
+        }
+
     }, ['APIFactory', 'UIFactory', 'CMSFactory', 'CheckoutFactory', 'ModalFactory'] );
 }( jQuery, PlentyFramework ));
 

diff --git a/dist/plentymarketsCMStools-1.0.18.min.js b/dist/plentymarketsCMStools-1.0.18.min.js
diff --git a/dist/plentymarketsCMStools-1.0.18.min.js.map b/dist/plentymarketsCMStools-1.0.18.min.js.map
diff --git a/dist/plentymarketsCMStools-libs-1.0.18.js b/dist/plentymarketsCMStools-libs-1.0.18.js
diff --git a/.../plentymarketsCMStools-libs-1.0.17.min.js → .../plentymarketsCMStools-libs-1.0.18.min.js b/.../plentymarketsCMStools-libs-1.0.17.min.js → .../plentymarketsCMStools-libs-1.0.18.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "plentymarketsCMStools",
   "license": "AGPL-3.0",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "repository": "https://github.com/plentymarkets/plenty-cms-library.git",
   "devDependencies": {
     "grunt": "^0.4.5",

diff --git a/src/directives/Basket.js b/src/directives/Basket.js
@@ -15,10 +15,15 @@
             pm.getRecentEvent().preventDefault();
             //init
             var basketItemsList = {};
+            var scheduler       = {};
             var $elem           = $( elem );
             var parentForm      = $elem.parents( 'form' );
             var $p_id           = parentForm.find( '[name="P_ID"]:checked' );
 
+            scheduler.SchedulerInterval = parentForm.find( '[name="scheduler_interval"]' ).val();
+            scheduler.SchedulerRepeating = parentForm.find( '[name="scheduler_repeating"]' ).val();
+            scheduler.SchedulerDate = parentForm.find( '[name="scheduler_dateselector"]' ).val();
+
             basketItemsList.BasketItemItemID   = parentForm.find( '[name="ArticleID"]' ).val();
             basketItemsList.BasketItemPriceID  = parentForm.find( '[name="SYS_P_ID"]' ).val();
             basketItemsList.BasketItemQuantity = parentForm.find( '[name^="ArticleQuantity"]' ).val();
@@ -52,6 +57,12 @@
                 basketItemsList.BasketItemAttributesList = attributesList;
             }
 
+            if(typeof scheduler.SchedulerInterval !== "undefined"
+                && scheduler.SchedulerInterval > 0)
+            {
+                BasketService.setScheduler( scheduler );
+            }
+
             //add basketItem and refresh previewLists
             BasketService.addItem( [basketItemsList] );
 

diff --git a/src/services/BasketService.js b/src/services/BasketService.js
@@ -37,7 +37,8 @@
             editItemAttributes: editItemAttributes,
             editOrderParams   : editOrderParams,
             addCoupon         : addCoupon,
-            removeCoupon      : removeCoupon
+            removeCoupon      : removeCoupon,
+            setScheduler      : setScheduler
         };
 
         /**
@@ -676,5 +677,21 @@
             }
         }
 
+        /**
+         * Set scheduler in checkout.
+         * @function setScheduler
+         * @param   {Array}     scheduler         Array containing the scheduler data
+         * @return {object} <a href="http://api.jquery.com/category/deferred-object/" target="_blank">jQuery deferred
+         *     Object</a>
+         */
+        function setScheduler(scheduler)
+        {
+            return API.put("/rest/checkout/scheduler", scheduler)
+                .done( function()
+                {
+                    updateContainer();
+                } );
+        }
+
     }, ['APIFactory', 'UIFactory', 'CMSFactory', 'CheckoutFactory', 'ModalFactory'] );
 }( jQuery, PlentyFramework ));