dever hace 3 años
padre
commit
675e41070b
Se han modificado 4 ficheros con 8 adiciones y 10 borrados
  1. 4 7
      app/mshop/src/Out.php
  2. 2 2
      app/shop/database/coupon.php
  3. 1 0
      app/shop/lib/Coupon.php
  4. 1 1
      app/shop/src/Buy.php

+ 4 - 7
app/mshop/src/Out.php

@@ -132,15 +132,13 @@ class Out extends Core
         $cdate = date('Y-m-d H:i', $data['cdate']);
 
         $config = Dever::db('shop/out_order')->config;
-        
+
         $status = $config['config_status'][$data['status']];
 
         $out_type = $config['config_type'][$data['out_type']];
 
         $print->hr('-', $main_config['name'])->br();
-        $pdf->br()->font(20)->center('出库单号:' . $data['order_num']);
-        $pdf->font(10);
-        $pdf->br(2);
+        $print->text('单号:' . $order['order_num'], 'CB')->br();
         $print->text('门店名称:' . $this->shop['name']);
         $print->text('制 单 人:'.$this->user['name']);
         $print->text('制单时间:'.date('Y-m-d H:i:s'));
@@ -168,9 +166,8 @@ class Out extends Core
 
         $pdf->hr();
 
-        $pdf->left('出库类别:' . $out_type);
-
-        $pdf->left('原因备注:' . $data['info']);
+        $pdf->text('出库类别:' . $out_type);
+        $pdf->text('原因备注:' . $data['info']);
 
         $pdf->hr();
 

+ 2 - 2
app/shop/database/coupon.php

@@ -183,7 +183,7 @@ return array
             'type' => 'all',
             'page' => array(10, 'list'),
             'order' => array('id' => 'desc'),
-            'col' => '*',
+            'col' => '*,num-act_num as num',
         ),
 
         # 列表
@@ -198,7 +198,7 @@ return array
             ),
             'type' => 'all',
             'order' => array('id' => 'desc'),
-            'col' => '*',
+            'col' => '*,num-act_num as num',
         ),
 
         'getData' => array

+ 1 - 0
app/shop/lib/Coupon.php

@@ -74,6 +74,7 @@ class Coupon
         }
 
         if ($data['total'] <= 0) {
+            Dever::alert('优惠券已无可用数量');
             return false;
         }
         if ($num > $data['total']) {

+ 1 - 1
app/shop/src/Buy.php

@@ -66,7 +66,7 @@ class Buy extends Core
 
 		$state = Dever::load('shop/lib/share')->getOne($this->uid, $this->shop['id'], 1);
         if (!$state) {
-            Dever::alert('您还完成分享');
+            Dever::alert('您还完成分享');
             return false;
         }
 		foreach ($coupon as $k => $v) {