Cancel button (on item_schedule) works.

diff --git a/haxe/ItemScheduler.hx b/haxe/ItemScheduler.hx
index 4799420e0399fb1e218dfd11290d606724b6ba3c..3122a9d14418efa74e94b81dfcf92bd66ea73349 100644 (file)
--- a/haxe/ItemScheduler.hx
+++ b/haxe/ItemScheduler.hx
@@ -430,9 +430,17 @@ function update() {
 
 }
 
+function cancel() {
+       parameters = null;
+}
+
 public function action() {
-       if(parameters != null && parameters.mode == ScheduleMode.Update) {
-               update();
+       if(parameters != null) {
+               switch(parameters.mode) {
+                       case ScheduleMode.Update: update();
+                       case ScheduleMode.Cancel: cancel();
+                       case ScheduleMode.Move:
+               }
        }
 }
 

diff --git a/hincludes/lib/ItemScheduler.class.php b/hincludes/lib/ItemScheduler.class.php
index 9e55a207f2bb5bb9b994917f2ba2caf63d59355d..9e7ae69e549fd9d003f457a195dc91aefef3d96a 100644 (file)
--- a/hincludes/lib/ItemScheduler.class.php
+++ b/hincludes/lib/ItemScheduler.class.php
@@ -17,10 +17,26 @@ class ItemScheduler {
                return (($user_picked === null) ? $picked : $user_picked);
        }
        public function action() {
-               if($this->parameters !== null && $this->parameters->mode == ScheduleMode::$Update) {
-                       $this->update();
+               if($this->parameters !== null) {
+                       $»t = ($this->parameters->mode);
+                       switch($»t->index) {
+                       case 0:
+                       {
+                               $this->update();
+                       }break;
+                       case 1:
+                       {
+                               $this->cancel();
+                       }break;
+                       case 2:
+                       {
+                       }break;
+                       }
                }
        }
+       public function cancel() {
+               $this->parameters = null;
+       }
        public function update() {
                $orders = $this->orders();
                $priorities = Lambda::harray(Lambda::map($orders, array(new _hx_lambda(array(&$orders), "ItemScheduler_0"), 'execute')));

diff --git a/item_schedule.php b/item_schedule.php
index 9eac399baa1838faa43ca7e42e27c7bd1f31b26e..30e1ac28bcf9eb6e4bb0fdd080c6bb25ad4a2dd6 100644 (file)
--- a/item_schedule.php
+++ b/item_schedule.php
@@ -74,6 +74,11 @@ if(isset($_POST['Update'])) {
        $params = new ScheduleParameters($_SESSION['schedule_parameters']);
        $params->setMode('update');
 }
+else if(isset($_POST['Cancel'])) {
+       $Ajax->activate('item_schedule');
+       $params = new ScheduleParameters($_SESSION['schedule_parameters']);
+       $params->setMode('cancel');
+}
 else {
        $params = in_ajax() && $stock_id == @$_POST['last_stock_id'] ? new ScheduleParameters($_POST) : null;
        // save parameters form update