From 50761112a1f69f4d4b9bcf0175b497b85beb71eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 10 Dec 2012 15:57:59 +0100
Subject: [PATCH] [-] Core: send email when payment is remotly accepted
 #PSCFV-6064

---
 install-dev/data/xml/order_state.xml      | 2 +-
 install-dev/langs/br/data/order_state.xml | 2 +-
 install-dev/langs/de/data/order_state.xml | 2 +-
 install-dev/langs/en/data/order_state.xml | 2 +-
 install-dev/langs/es/data/order_state.xml | 2 +-
 install-dev/langs/fr/data/order_state.xml | 2 +-
 install-dev/langs/it/data/order_state.xml | 2 +-
 install-dev/upgrade/sql/1.5.2.1.sql       | 7 ++++++-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/install-dev/data/xml/order_state.xml b/install-dev/data/xml/order_state.xml
index c4fb9deb2..8303f99ad 100644
--- a/install-dev/data/xml/order_state.xml
+++ b/install-dev/data/xml/order_state.xml
@@ -24,6 +24,6 @@
     <order_state id="On_backorder" invoice="1" send_email="1" color="HotPink" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="1"/>
     <order_state id="Awaiting_bank_wire_payment" invoice="0" send_email="1" module_name="bankwire" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
     <order_state id="Awaiting_PayPal_payment" invoice="0" send_email="0" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
-    <order_state id="Payment_remotely_accepted" invoice="1" send_email="0" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
+    <order_state id="Payment_remotely_accepted" invoice="1" send_email="1" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
   </entities>
 </entity_order_state>
diff --git a/install-dev/langs/br/data/order_state.xml b/install-dev/langs/br/data/order_state.xml
index 8d6d1db19..c44dc3358 100644
--- a/install-dev/langs/br/data/order_state.xml
+++ b/install-dev/langs/br/data/order_state.xml
@@ -46,6 +46,6 @@
   </order_state>
   <order_state id="Payment_remotely_accepted">
     <name>Payment remotely accepted</name>
-    <template/>
+    <template>payment</template>
   </order_state>
 </entity_order_state>
diff --git a/install-dev/langs/de/data/order_state.xml b/install-dev/langs/de/data/order_state.xml
index 62f95dce8..5ecd638a7 100644
--- a/install-dev/langs/de/data/order_state.xml
+++ b/install-dev/langs/de/data/order_state.xml
@@ -46,6 +46,6 @@
   </order_state>
   <order_state id="Payment_remotely_accepted">
     <name>Payment Anmeldung erfolgreich</name>
-    <template/>
+    <template>payment</template>
   </order_state>
 </entity_order_state>
diff --git a/install-dev/langs/en/data/order_state.xml b/install-dev/langs/en/data/order_state.xml
index 8d6d1db19..c44dc3358 100644
--- a/install-dev/langs/en/data/order_state.xml
+++ b/install-dev/langs/en/data/order_state.xml
@@ -46,6 +46,6 @@
   </order_state>
   <order_state id="Payment_remotely_accepted">
     <name>Payment remotely accepted</name>
-    <template/>
+    <template>payment</template>
   </order_state>
 </entity_order_state>
diff --git a/install-dev/langs/es/data/order_state.xml b/install-dev/langs/es/data/order_state.xml
index c0ae46b30..f85b3b80e 100644
--- a/install-dev/langs/es/data/order_state.xml
+++ b/install-dev/langs/es/data/order_state.xml
@@ -46,6 +46,6 @@
   </order_state>
   <order_state id="Payment_remotely_accepted">
     <name>Payment remotely accepted</name>
-    <template/>
+    <template>payment</template>
   </order_state>
 </entity_order_state>
diff --git a/install-dev/langs/fr/data/order_state.xml b/install-dev/langs/fr/data/order_state.xml
index bfeb08f86..c963fdd58 100644
--- a/install-dev/langs/fr/data/order_state.xml
+++ b/install-dev/langs/fr/data/order_state.xml
@@ -46,6 +46,6 @@
   </order_state>
   <order_state id="Payment_remotely_accepted">
     <name>Paiement &#xE0; distance accept&#xE9;</name>
-    <template/>
+    <template>payment</template>
   </order_state>
 </entity_order_state>
diff --git a/install-dev/langs/it/data/order_state.xml b/install-dev/langs/it/data/order_state.xml
index ed7307d65..dbac01a5d 100644
--- a/install-dev/langs/it/data/order_state.xml
+++ b/install-dev/langs/it/data/order_state.xml
@@ -46,6 +46,6 @@
   </order_state>
   <order_state id="Payment_remotely_accepted">
     <name>Payment remotely accepted</name>
-    <template/>
+    <template>payment</template>
   </order_state>
 </entity_order_state>
diff --git a/install-dev/upgrade/sql/1.5.2.1.sql b/install-dev/upgrade/sql/1.5.2.1.sql
index 8dea65958..179429f32 100644
--- a/install-dev/upgrade/sql/1.5.2.1.sql
+++ b/install-dev/upgrade/sql/1.5.2.1.sql
@@ -10,4 +10,9 @@ UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3;
 
 ALTER TABLE  `PREFIX_product_shop` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`;
 
-ALTER TABLE  `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`;
\ No newline at end of file
+ALTER TABLE  `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`;
+
+UPDATE `PREFIX_order_state` SET `send_email` = 1 WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1);
+
+UPDATE `PREFIX_order_state_lang` SET `template` = 'payment' WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1);
+