Inital commit

local/modules/Colissimo/Controller/Export.php

@@ -14,7 +14,6 @@ namespace Colissimo\Controller;
 
 use Colissimo\Colissimo;
 use Colissimo\Model\ColissimoQuery;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Controller\Admin\BaseAdminController;
 use Thelia\Core\Event\Order\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
@@ -27,15 +26,12 @@ use Thelia\Form\Exception\FormValidationException;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\CountryQuery;
 use Thelia\Model\CustomerTitleQuery;
-use Thelia\Model\OrderQuery;
-use Thelia\Model\OrderStatus;
 use Thelia\Model\OrderStatusQuery;
 
-
 /**
  * Class Export
  * @package Colissimo\Controller
- * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ * @author Manuel Raynaud <manu@raynaud.io>
  */
 class Export extends BaseAdminController
 {
@@ -53,17 +49,18 @@ class Export extends BaseAdminController
         try {
             $exportForm = $this->validateForm($form);
 
+            // Get new status
             $status_id = $exportForm->get('status_id')->getData();
-
             $status = OrderStatusQuery::create()
                 ->filterByCode($status_id)
                 ->findOne();
 
-            $orders = ColissimoQuery::getOrders()
-                ->find();
+            // Get Colissimo orders
+            $orders = ColissimoQuery::getOrders()->find();
 
             $export = "";
-            $store_name = ConfigQuery::read("store_name");
+            $store_name = ConfigQuery::getStoreName();
+
             /** @var $order \Thelia\Model\Order */
             foreach ($orders as $order) {
 
@@ -71,6 +68,7 @@ class Export extends BaseAdminController
 
                 if ($value) {
 
+                    // Get order information
                     $customer = $order->getCustomer();
                     $locale = $order->getLang()->getLocale();
                     $address = $order->getOrderAddressRelatedByDeliveryOrderAddressId();
@@ -78,6 +76,14 @@ class Export extends BaseAdminController
                     $country->setLocale($locale);
                     $customerTitle = CustomerTitleQuery::create()->findPk($address->getCustomerTitleId());
                     $customerTitle->setLocale($locale);
+                    $weight = $exportForm->get('order_weight_'.$order->getId())->getData();
+
+                    if ($weight == 0) {
+                        /** @var \Thelia\Model\OrderProduct $product */
+                        foreach ($order->getOrderProducts() as $product) {
+                            $weight += (double)$product->getWeight();
+                        }
+                    }
 
                     /**
                      * Get user's phone & cellphone
@@ -94,9 +100,7 @@ class Export extends BaseAdminController
                         }
                     }
 
-                    /**
-                     * Cellp
-                     */
+                    // Cellphone
                     $cellphone = $customer->getDefaultAddress()->getCellphone();
 
                     if (empty($cellphone)) {
@@ -107,32 +111,37 @@ class Export extends BaseAdminController
                         }
                     }
 
-                    /**
-                     * Compute package weight
-                     */
-                    $weight = 0;
-                    /** @var \Thelia\Model\OrderProduct $product */
-                    foreach ($order->getOrderProducts() as $product) {
-                        $weight+=(double) $product->getWeight();
-                    }
 
-                    $export .= "\"".$order->getRef()."\";\"".$address->getLastname()."\";\"".$address->getFirstname()."\";\"".$address->getAddress1()."\";\"".$address->getAddress2()."\";\"".$address->getAddress3()."\";\"".$address->getZipcode()."\";\"".$address->getCity()."\";\"".$country->getTitle()."\";\"".$phone."\";\"".$cellphone."\";\"".$weight."\";\"\";\"\";\"".$store_name."\";\"DOM\";\r\n";
+                    $export .=
+                        "\"".$order->getRef()
+                        ."\";\"".$address->getLastname()
+                        ."\";\"".$address->getFirstname()
+                        ."\";\"".$address->getAddress1()
+                        ."\";\"".$address->getAddress2()
+                        ."\";\"".$address->getAddress3()
+                        ."\";\"".$address->getZipcode()
+                        ."\";\"".$address->getCity()
+                        ."\";\"".$country->getIsoalpha2()
+                        ."\";\"".$phone
+                        ."\";\"".$cellphone
+                        ."\";\"".$weight
+                        ."\";\"".$customer->getEmail()
+                        ."\";\"\";\"".$store_name
+                        ."\";\"DOM\";\r\n";
 
                     if ($status) {
                         $event = new OrderEvent($order);
                         $event->setStatus($status->getId());
                         $this->getDispatcher()->dispatch(TheliaEvents::ORDER_UPDATE_STATUS, $event);
                     }
-
-
                 }
-
             }
 
             return Response::create(
-                $export,
+                utf8_decode($export),
                 200,
                 array(
+                    "Content-Encoding"=>"ISO-8889-1",
                     "Content-Type"=>"application/csv-tab-delimited-table",
                     "Content-disposition"=>"filename=export.csv"
                 )
@@ -140,7 +149,7 @@ class Export extends BaseAdminController
 
         } catch (FormValidationException $e) {
             $this->setupFormErrorContext(
-                Translator::getInstance()->trans("colissimo expeditor export", [], Colissimo::MESSAGE_DOMAIN),
+                Translator::getInstance()->trans("colissimo expeditor export", [], Colissimo::DOMAIN_NAME),
                 $e->getMessage(),
                 $form,
                 $e
@@ -154,5 +163,4 @@ class Export extends BaseAdminController
             );
         }
     }
-
-} 
+}