order

fyndiq · May 28, 2015 · 8a02491 · 8a02491
1 parent 83b83b5
commit 8a02491
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 29 deletions.
diff --git a/src/backoffice/FmOutput.php b/src/backoffice/FmOutput.php
@@ -69,6 +69,4 @@ public function output($output)
         echo $output;
         return true;
     }
-
-
 }
diff --git a/src/backoffice/FmPrestashop.php b/src/backoffice/FmPrestashop.php
@@ -169,13 +169,28 @@ public function getCountryCode()
         return $this->contextGetContext()->country->iso_code;
     }
 
-    public function forceCreateDir($path, $rights) {
+    public function forceCreateDir($path, $rights)
+    {
         if (!is_writable($path)) {
             $ret &= createDir($path, $rights);
         }
         return true;
     }
 
+    public function markOrderAsDone($orderId, $orderDoneState)
+    {
+        $objOrder = new Order($orderId);
+        $history = new OrderHistory();
+        $history->id_order = (int)$objOrder->id;
+        return $history->changeIdOrderState($orderDoneState, $objOrder);
+    }
+
+    public function getOrderStateName($doneState)
+    {
+        $currentState = new OrderState($orderDoneState);
+        return $currentState->name[1];
+    }
+
     // Global variables
     public function globalPsRootDir()
     {

diff --git a/src/backoffice/FmServiceController.php b/src/backoffice/FmServiceController.php
@@ -15,7 +15,8 @@ public function __construct($fmPrestashop, $fmOutput, $fmConfig, $fmApiModel)
         $this->fmApiModel = $fmApiModel;
     }
 
-    public function handleRequest($params) {
+    public function handleRequest($params)
+    {
         if (!isset($params['action'])) {
             return $this->fmOutput->showError(400, 'Bad Request', '400 Bad Request');
         }
@@ -32,7 +33,7 @@ public function handleRequest($params) {
                 case 'delete_exported_products':
                     return $this->fmOutput->renderJSON($this->serviceDeleteExportedProducts($args));
                 case 'update_order_status':
-                    return $this->fmOutput->renderJSON($this->serviceUpdateOrderStatus($args));
+                    return $this->fmOutput->renderJSON($this->updateOrderStatus($args));
                 case 'load_orders':
                     return $this->fmOutput->renderJSON($this->loadOrders($args));
                 case 'get_delivery_notes':
@@ -176,7 +177,8 @@ private function getProducts($args)
     private function loadOrders($args)
     {
         $page = (isset($args['page']) and $args['page'] > 0) ? $args['page']: 1;
-        $orders = FmOrder::getImportedOrders($page, FyndiqUtils::PAGINATION_ITEMS_PER_PAGE);
+        $fmOrder = new FmOrder($this->fmPrestashop, $this->fmConfig);
+        $orders = $fmOrder->getImportedOrders($page, FyndiqUtils::PAGINATION_ITEMS_PER_PAGE);
 
         $object = new stdClass();
         $object->orders = $orders;
@@ -193,16 +195,19 @@ private function loadOrders($args)
         $this->response($object);
     }
 
-    private function update_order_status($args)
+    private function updateOrderStatus($args)
     {
         if (isset($args['orders']) && is_array($args['orders'])) {
             $doneState = '';
+            $doneState = $this->fmConfig->get('done_state');
+            $fmOrder = new FmOrder($this->fmPrestashop, $this->fmConfig);
             foreach ($args['orders'] as $order) {
                 if (is_numeric($order)) {
-                    $doneState = FmOrder::markOrderAsDone($order);
+                    $doneState = $fmOrder->markOrderAsDone($order, $doneState);
                 }
             }
-            return $this->response($doneState);
+            $doneStateName = $this->fmPrestashop->getOrderStateName($doneState);
+            return $this->response($doneStateName);
         }
         $this->response(false);
     }

diff --git a/src/backoffice/models/order.php → src/backoffice/models/FmOrder.php b/src/backoffice/models/order.php → src/backoffice/models/FmOrder.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: confact
- * Date: 04/08/14
- * Time: 08:42
- */
-
 /**
  * Class FmOrder
  *
  * handles orders
  */
-class FmOrder
+class FmOrder extends FmModel
 {
 
     const FYNDIQ_ORDERS_EMAIL = 'info@fyndiq.se';
@@ -404,7 +397,7 @@ public static function addOrderLog($orderId, $fyndiqOrderId)
         return $ret;
     }
 
-    public static function getImportedOrders($page, $perPage)
+    public function getImportedOrders($page, $perPage)
     {
         $module = Module::getInstanceByName('fyndiqmerchant');
 
@@ -413,7 +406,7 @@ public static function getImportedOrders($page, $perPage)
 
         $orders = Db::getInstance()->ExecuteS($sqlQuery);
         $return = array();
-        $orderDoneState = FmConfig::get('done_state');
+        $orderDoneState = $this->fmConfig->get('done_state');
 
         foreach ($orders as $order) {
             $orderArray = $order;
@@ -499,14 +492,8 @@ private static function getProductBySKU($productSKU)
         return false;
     }
 
-    public static function markOrderAsDone($orderId)
+    public function markOrderAsDone($orderId, $orderDoneState)
     {
-        $orderDoneState = FmConfig::get('done_state');
-        $objOrder = new Order($orderId);
-        $history = new OrderHistory();
-        $history->id_order = (int)$objOrder->id;
-        $history->changeIdOrderState($orderDoneState, $objOrder);
-        $currentState = new OrderState($orderDoneState);
-        return $currentState->name[1];
+        return $this->fmPrestashop->markOrderAsDone($orderId, $orderDoneState);
     }
 }
diff --git a/src/backoffice/service.php b/src/backoffice/service.php
@@ -11,7 +11,7 @@
 require_once('./models/FmProductInfo.php');
 require_once('./models/FmApiModel.php');
 require_once('./FmConfig.php');
-require_once('./models/order.php');
+require_once('./models/FmOrder.php');
 require_once('./models/order_fetch.php');
 require_once('./FmServiceController.php');
 

diff --git a/src/fyndiqmerchant.php b/src/fyndiqmerchant.php
@@ -14,7 +14,7 @@
 require_once('backoffice/models/FmModel.php');
 require_once('backoffice/models/FmProductExport.php');
 require_once('backoffice/models/FmApiModel.php');
-require_once('backoffice/models/order.php');
+require_once('backoffice/models/FmOrder.php');
 
 class FyndiqMerchant extends Module
 {