课程表取消

application/admin/controller/Lessonslot.php

@@ -12,7 +12,7 @@ use app\common\library\Email;
  */
 class Lessonslot extends Backend
 {
-    protected $noNeedLogin = ['vue_index','vue_staff','slot_add','slot_info','slot_edit'];
+    protected $noNeedLogin = ['vue_index','vue_staff','slot_add','slot_info','slot_edit','cancel'];
 
     /**
      * Lessonslot模型对象
@@ -79,15 +79,18 @@ class Lessonslot extends Backend
      */
     public function cancel(){
         $id = input('id');
-        $info = Db::name('lesson_slot')->where('id',$id)->where('status',0)->find();
+        $info = Db::name('lesson_slot')->where('id',$id)->find();
         if(!$info){
             $this->error('请刷新重试');
         }
+        if($info['status'] != 0){
+            $this->error('当前订单不能取消');
+        }
 
         if($this->request->isPost()){
             $remark        = input('remark','');
             $cancel_reason = input('cancel_reason','');
-            $cancel_time   = strtotime(input('cancel_time',''));
+            $cancel_time   = time();
 
             Db::startTrans();
             $update = [
@@ -160,7 +163,15 @@ class Lessonslot extends Backend
             }
 
             Db::commit();
-            $this->success('取消完成');
+
+            $comefrom = input('comefrom','');
+            if($comefrom == 'backend'){
+                //后台来的
+                $this->success('取消完成');
+            }else{
+                //接口来的
+                $this->result('',1,'取消完成','json');
+            }
 
         }
 

application/admin/lang/en/lessonslot.php

@@ -7,6 +7,7 @@ return [
     'Endtime'         => 'End time',
     'Num_min'         => 'Num min(cancel）',
     'Num_max'         => 'Num max',
+    'Bookednum'       => 'booked number',
     'Coach_ids'       => 'Coach ids',
     'Lesson_id'       => 'Lesson id',
     'Address'         => 'Address',

application/admin/lang/zh-cn/lessonslot.php

@@ -7,6 +7,7 @@ return [
     'Endtime'                => '结束时间',
     'Num_min'                => '最少人数(取消）',
     'Num_max'                => '最多人数',
+    'Bookednum'              => '已预约人数',
     'Waitnum_max'            => '候补最多人数',
     'Coach_ids'              => '选择教练',
     'Lesson_id'              => '课程id',

application/admin/view/lessonslot/cancel.html

@@ -1,5 +1,5 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+    <input type="hidden" name="comefrom" value="backend">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -34,12 +34,12 @@
             <input id="c-cancel_reason" class="form-control" name="cancel_reason" type="text" value="{$row.cancel_reason|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_time')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-cancel_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="cancel_time" type="text" value="{:$row.cancel_time?datetime($row.cancel_time):''}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">提示:</label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/lessonslot.js

@@ -33,6 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'num_min', title: __('Num_min')},
                         {field: 'num_max', title: __('Num_max')},
+                        {field: 'bookednum', title: __('Bookednum')},
                         {field: 'waitnum_max', title: __('Waitnum_max')},
                         {field: 'coach_ids', title: __('Coach_ids'), operate: 'LIKE'},
                         {field: 'coach.nickname', title: __('Coach.nickname'), operate: 'LIKE'},