重建售课预约单

application/admin/lang/en/lessonorder.php

@@ -17,17 +17,20 @@ return [
     'Paytype 1'        => 'package',
     'Paytype 2'        => 'Online payment',
     'Paytype 3'        => 'Purchase package',
+    'Paytype 4'        => 'Try lesson',
     'Paytime'          => 'Pay time',
     'Createtime'       => 'Create time',
     'Updatetime'       => 'Update time',
     'Finishtime'       => 'sign time',
-    'Usernumber'       => 'Reservation number',
+    'Usernumber'       => 'Reservation user number',
+    'Usernumber_hours' => 'Reservation all hours',
     'Usernumber_sign'  => 'Number of sign-ups',
     'Userremark'       => 'User remark',
     'Package_order_id' => 'Package order id',
     'Package_remark'   => 'Package remark',
     'Cancel_reason'    => 'Cancel reason',
     'Cancel_time'      => 'Cancel time',
+    'Trylesson_order_id' => 'try lesson order id',
     'User.firstname'   => 'firstname',
     'User.lastname'    => 'lastname',
     'Slot.starttime'   => 'start time',

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

@@ -1,37 +1,40 @@
 <?php
 
 return [
-    'Id'               => 'id',
-    'Order_no'         => '订单号',
-    'User_id'          => '用户id',
-    'Slot_id'          => '日程表id',
-    'Lesson_id'        => '课程id',
-    'Order_amount'     => '订单金额',
-    'Order_status'     => '状态',
-    'Order_status 0'   => '待支付',
-    'Order_status 10'  => '已支付',
-    'Order_status 20'  => '已点名',
-    'Order_status 30'  => '已取消',
-    'Order_status 40'  => '已退课',
-    'Paytype'          => '支付类型',
-    'Paytype 1'        => '课程套餐',
-    'Paytype 2'        => '线上付款',
-    'Paytype 3'        => '购买套餐中',
-    'Paytime'          => '在线支付时间',
-    'Createtime'       => '创建时间',
-    'Updatetime'       => '更新时间',
-    'Finishtime'       => '点名时间',
-    'Usernumber'       => '预约人数',
-    'Usernumber_sign'  => '签到人数',
-    'Userremark'       => '参与者信息备注',
-    'Package_order_id' => '套餐订单id',
-    'Package_remark'   => '套餐第几课时',
-    'Cancel_reason'    => '取消原因',
-    'Cancel_time'      => '取消时间',
-    'User.firstname'   => '名',
-    'User.lastname'    => '姓',
-    'Slot.starttime'   => '开始时间',
-    'Slot.endtime'     => '结束时间',
-    'Lesson.name'      => '课程标题',
-    'Lesson.name_en'   => '课程标题(en)'
+    'Id'                 => 'id',
+    'Order_no'           => '订单号',
+    'User_id'            => '用户id',
+    'Slot_id'            => '日程表id',
+    'Lesson_id'          => '课程id',
+    'Order_amount'       => '订单金额',
+    'Order_status'       => '状态',
+    'Order_status 0'     => '待支付',
+    'Order_status 10'    => '已支付',
+    'Order_status 20'    => '已点名',
+    'Order_status 30'    => '已取消',
+    'Order_status 40'    => '已退课',
+    'Paytype'            => '支付类型',
+    'Paytype 1'          => '课程套餐',
+    'Paytype 2'          => '线上付款',
+    'Paytype 3'          => '购买套餐中',
+    'Paytype 4'          => '试课订单',
+    'Paytime'            => '在线支付时间',
+    'Createtime'         => '创建时间',
+    'Updatetime'         => '更新时间',
+    'Finishtime'         => '点名时间',
+    'Usernumber'         => '预约人数',
+    'Usernumber_hours'   => '预约人数课时',
+    'Usernumber_sign'    => '签到人数',
+    'Userremark'         => '参与者信息备注',
+    'Package_order_id'   => '套餐订单id',
+    'Package_remark'     => '套餐第几课时',
+    'Cancel_reason'      => '取消原因',
+    'Cancel_time'        => '取消时间',
+    'Trylesson_order_id' => '试课订单id',
+    'User.firstname'     => '名',
+    'User.lastname'      => '姓',
+    'Slot.starttime'     => '开始时间',
+    'Slot.endtime'       => '结束时间',
+    'Lesson.name'        => '课程标题',
+    'Lesson.name_en'     => '课程标题(en)'
 ];

application/admin/model/Lessonorder.php

@@ -41,7 +41,7 @@ class Lessonorder extends Model
 
     public function getPaytypeList()
     {
-        return ['1' => __('Paytype 1'), '2' => __('Paytype 2'), '3' => __('Paytype 3')];
+        return ['1' => __('Paytype 1'), '2' => __('Paytype 2'), '3' => __('Paytype 3'), '4' => __('Paytype 4')];
     }
 
 

application/admin/view/lessonorder/add.html

@@ -73,6 +73,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Usernumber_hours')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-usernumber_hours" data-rule="required" class="form-control" step="0.1" name="row[usernumber_hours]" type="number" value="1.0">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Usernumber_sign')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-usernumber_sign" data-rule="required" class="form-control" name="row[usernumber_sign]" type="number" value="0">
@@ -108,6 +114,12 @@
             <input id="c-cancel_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[cancel_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Trylesson_order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-trylesson_order_id" data-rule="required" data-source="trylesson/order/index" class="form-control selectpage" name="row[trylesson_order_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/lessonorder/edit.html

@@ -73,6 +73,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Usernumber_hours')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-usernumber_hours" data-rule="required" class="form-control" step="0.1" name="row[usernumber_hours]" type="number" value="{$row.usernumber_hours|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Usernumber_sign')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-usernumber_sign" data-rule="required" class="form-control" name="row[usernumber_sign]" type="number" value="{$row.usernumber_sign|htmlentities}">
@@ -108,6 +114,12 @@
             <input id="c-cancel_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[cancel_time]" type="text" value="{:$row.cancel_time?datetime($row.cancel_time):''}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Trylesson_order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-trylesson_order_id" data-rule="required" data-source="trylesson/order/index" class="form-control selectpage" name="row[trylesson_order_id]" type="text" value="{$row.trylesson_order_id|htmlentities}">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/lessonorder.js

@@ -41,18 +41,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'lesson.name_en', title: __('Lesson.name_en'), operate: 'LIKE'},
                         {field: 'order_amount', title: __('Order_amount'), operate:'BETWEEN'},
                         {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"10":__('Order_status 10'),"20":__('Order_status 20'),"30":__('Order_status 30'),"40":__('Order_status 40')}, formatter: Table.api.formatter.status},
-                        {field: 'paytype', title: __('Paytype'), searchList: {"1":__('Paytype 1'),"2":__('Paytype 2'),"3":__('Paytype 3')}, formatter: Table.api.formatter.normal},
+                        {field: 'paytype', title: __('Paytype'), searchList: {"1":__('Paytype 1'),"2":__('Paytype 2'),"3":__('Paytype 3'),"4":__('Paytype 4')}, formatter: Table.api.formatter.normal},
                         {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'finishtime', title: __('Finishtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'usernumber', title: __('Usernumber')},
+//                        {field: 'usernumber_hours', title: __('Usernumber_hours'), operate:'BETWEEN'},
                         {field: 'usernumber_sign', title: __('Usernumber_sign')},
                         {field: 'userremark', title: __('Userremark'), operate: 'LIKE'},
                         {field: 'package_order_id', title: __('Package_order_id')},
                         {field: 'package_remark', title: __('Package_remark'), operate: 'LIKE'},
                         {field: 'cancel_reason', title: __('Cancel_reason'), operate: 'LIKE'},
                         {field: 'cancel_time', title: __('Cancel_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'trylesson_order_id', title: __('Trylesson_order_id')},