Merge pull request #136 from andrefatchip/OX6-41

OX6-41: Added softer obstical for recovering an order by receiving pa…

Author: T-Kuchel

status.php

@@ -391,7 +391,21 @@ public function handle()
                     oxDb::getDb()->Execute($query);
                 }
                 if($this->fcGetPostParam('txaction') == 'paid') {
-                    $query = "UPDATE oxorder SET oxfolder = 'ORDERFOLDER_NEW', oxtransstatus = 'OK' WHERE oxid = '{$sOrderId}' AND oxtransstatus = 'INCOMPLETE' AND oxfolder = 'ORDERFOLDER_PROBLEMS'";
+                    $oLang = oxNew('oxLang');
+                    $sReplacement = $oLang->translateString('FCPO_REMARK_APPOINTED_MISSING');
+
+                    $query = "
+                        UPDATE 
+                            oxorder 
+                        SET 
+                            oxfolder = 'ORDERFOLDER_NEW', 
+                            oxtransstatus = 'OK',
+                            oxremark = REPLACE(oxremark, '".$sReplacement."', '')
+                        WHERE 
+                            oxid = '{$sOrderId}' AND 
+                            oxtransstatus IN ('INCOMPLETE', 'ERROR') AND 
+                            oxfolder = 'ORDERFOLDER_PROBLEMS'
+                    ";
                     oxDb::getDb()->Execute($query);
                 }