Changeset 18087

Timestamp:

2009/06/09 23:21:48 (14 years ago)

Author:

Seasoft

Message:

merge r18017
・取得元: version-2_4
【取得元のログメッセージ】

• #468 受注履歴編集で商品を変更できない 不具合を修正。商品追加、削除後の金額の再計算がされず、不便なため再計算するよう修正。

Location:

branches/comu-ver2/data

Files:

• Smarty/templates/default/admin/order/edit.tpl (modified) (1 diff)
• class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (6 diffs)

branches/comu-ver2/data/Smarty/templates/default/admin/order/edit.tpl

@@ -318 +318 @@
                 <input type="hidden" name="classcategory_name2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name2.value[$key]}-->" id="classcategory_name2_<!--{$key}-->" />
                 <br />
-                <input type="button" name="change" value="変更" onclick="win03('<!--{$smarty.const.SITE_URL}-->admin/products/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
+                <input type="button" name="change" value="変更" onclick="win03('<!--{$smarty.const.SITE_URL}-->admin/order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
                 <!--{if $product_count > 1}-->
                     <input type="button" name="delete" value="削除" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products');" />

branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -150 +150 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = array_merge((array)$this->lfCheckError(), (array)$this->lfCheek($_POST['mode']));
+            $this->arrErr = $this->lfCheckError();
 
             if(count($this->arrErr) == 0) {
@@ -178 +178 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = array_merge((array)$this->lfCheckError(), (array)$this->lfCheek($_POST['mode']));
+            $this->arrErr = $this->lfCheckError();
             break;
         /* ペイジェント決済モジュール連携用 */
@@ -202 +202 @@
             // 入力値の変換
             $this->objFormParam->convParam();
+            $this->arrErr = $this->lfCheckError();
             break;
         /* 商品追加ポップアップより商品選択後、商品情報取得*/
@@ -224 +225 @@
             // 入力値の変換
             $this->objFormParam->convParam();
+            $this->arrErr = $this->lfCheckError();
             break;
         /* 顧客検索ポップアップより顧客指定後、顧客情報取得*/
@@ -448 +450 @@
         $objErr->arrErr = $this->objFormParam->checkError();
 
-        return $objErr->arrErr;
+        if (count($objErr->arrErr) >= 1) {
+            return $objErr->arrErr;
+        }
+        
+        return $this->lfCheek();
     }
 
     /* 計算処理 */
-    function lfCheek($mode = "") {
+    function lfCheek() {
         $objDb = new SC_Helper_DB_Ex();
         $arrVal = $this->objFormParam->getHashArray();
@@ -496 +502 @@
         }
         //新規追加受注のみ
-        if ($mode == "add") {
+        if ($_POST['mode'] == "add") {
             if ($arrVal['total_point'] < 0) {
                     $arrErr['use_point'] = '最終保持ポイントがマイナス表示にならないように調整して下さい。<br />';