From 1603a89cff5ce8538f8cf9e1adf0ae34fb986f9c Mon Sep 17 00:00:00 2001
From: Franck Allimant <franck@cqfdev.fr>
Date: Thu, 17 Apr 2014 20:50:35 +0200
Subject: [PATCH] Fixed postage amount reset.

---
 core/lib/Thelia/Action/Order.php                  |   2 +-
 .../backOffice/default/assets/img/flags/TES.png   | Bin 0 -> 176 bytes
 .../backOffice/default/assets/img/flags/TEST.png  | Bin 0 -> 176 bytes
 web/.htaccess                                     |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 templates/backOffice/default/assets/img/flags/TES.png
 create mode 100644 templates/backOffice/default/assets/img/flags/TEST.png

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 78534b268..70e181a40 100644
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -112,7 +112,7 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         // Reset postage cost if the delivery module had been removed
         if ($deliveryModuleId <= 0) {
-            $this->setPostage(0);
+            $order->setPostage(0);
         }
 
         $event->setOrder($order);
diff --git a/templates/backOffice/default/assets/img/flags/TES.png b/templates/backOffice/default/assets/img/flags/TES.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d91c7f4b8c00b234e2d9663d7ee141f51e981a4
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar`&KKmPx>XI7o@@X^+2
zkwl5d_A_U+v8}nk>ver%sj<X%{~7=O-+0NrL^9y!m9O>Z9!>qvFJsMXmU8jb*CWye
z&mM*D=+(ZK&nnGOBzQ8B;WOI_flW+>*Bck_nB&(T!H^iB(6q;(Ku_T)!>7+oM|VyP
aVrDSUR%x|P6txCAfx*+&&t;ucLK6T}twc`%

literal 0
HcmV?d00001

diff --git a/templates/backOffice/default/assets/img/flags/TEST.png b/templates/backOffice/default/assets/img/flags/TEST.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d91c7f4b8c00b234e2d9663d7ee141f51e981a4
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar`&KKmPx>XI7o@@X^+2
zkwl5d_A_U+v8}nk>ver%sj<X%{~7=O-+0NrL^9y!m9O>Z9!>qvFJsMXmU8jb*CWye
z&mM*D=+(ZK&nnGOBzQ8B;WOI_flW+>*Bck_nB&(T!H^iB(6q;(Ku_T)!>7+oM|VyP
aVrDSUR%x|P6txCAfx*+&&t;ucLK6T}twc`%

literal 0
HcmV?d00001

diff --git a/web/.htaccess b/web/.htaccess
index dfe03bf51..9bbc5928b 100755
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -7,7 +7,7 @@ AddDefaultCharset UTF-8
 
     # If thelia is installed in a subdirectory (e.g., thelia2)
     # define the RewriteBase below to get a proper URL rewriting
-    # RewriteBase /thelia2
+    RewriteBase /thelia2
 
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d