dever 6 年 前
コミット
659a778e6c
3 ファイル変更11 行追加2 行削除
  1. 1 1
      act/database/order.php
  2. 5 0
      act/src/Order.php
  3. 5 1
      buy/src/Buy.php

+ 1 - 1
act/database/order.php

@@ -536,7 +536,7 @@ return array
             'type' => 'all',
             'order' => array('id' => 'desc'),
             'page' => array(10, 'list'),
-            'col' => 'order_id,name,buy_num,cdate,cash,product_id',
+            'col' => 'order_id,name,buy_num,cdate,cash,product_id,buy_id',
         ),
     ),
 );

+ 5 - 0
act/src/Order.php

@@ -128,6 +128,11 @@ class Order extends Core
                 $this->data['order'][$k]['cdate'] = date('Y年m月d日 H:i:s', $v['cdate']);
                 $name = explode('-', $v['name']);
                 $this->data['order'][$k]['name'] = $name[0];
+
+                if (isset($v['buy_num']) && $v['buy_num'] <= 0 && $v['buy_id']) {
+                    $buy = $this->getBuy($v['buy_id']);
+                    $this->data['order'][$k]['buy_num'] = $buy['num']; 
+                }
             }
         }
 

+ 5 - 1
buy/src/Buy.php

@@ -63,7 +63,11 @@ class Buy extends Base
         if ($data) {
             foreach ($data as $k => $v) {
                 $data[$k]['cdate'] = date('Y年m月d日 H:i', $v['cdate']);
-                $data[$k]['link'] = $this->url('codedetail', array('order_id' => $v['order_id'], 'id' => $v['product_id']));;
+                $data[$k]['link'] = $this->url('codedetail', array('order_id' => $v['order_id'], 'id' => $v['product_id']));
+                if (isset($v['buy_num']) && $v['buy_num'] <= 0 && $v['buy_id']) {
+                    $buy = $this->getBuy($v['buy_id']);
+                    $data[$k]['buy_num'] = $v['buy_num'] = $buy['num']; 
+                }
                 $data[$k]['desc'] = $v['buy_num'] . '本 ¥' . number_format($v['cash'], 2);
                 $name = explode('-', $v['name']);
                 $data[$k]['name'] = $name[0];