Browse Source

update onetime package

Tokumeikoi 5 years ago
parent
commit
60b197410c

+ 3 - 6
app/Console/Commands/CheckOrder.php

@@ -64,13 +64,10 @@ class CheckOrder extends Command
     {
         $user = User::find($order->user_id);
         $plan = Plan::find($order->plan_id);
-        switch ($plan->type) {
-            // cycle
-            case 0: return $this->buyByCycle($order, $user, $plan);
-            // onetime
-            case 1: return $this->buyByOneTime($order, $user, $plan);
+        if ($order->cycle === 'onetime_price') {
+            return $this->buyByOneTime($order, $user, $plan);
         }
-        return $this->buy($order, $user, $plan);
+        return $this->buyByCycle($order, $user, $plan);
     }
 
     private function buyByCycle(Order $order, User $user, Plan $plan)

+ 0 - 1
app/Http/Requests/Admin/PlanSave.php

@@ -10,7 +10,6 @@ class PlanSave extends FormRequest
         'name' => 'required',
         'content' => '',
         'group_id' => 'required',
-        'type' => 'required|in:0,1',
         'transfer_enable' => 'required',
         'month_price' => 'nullable|integer',
         'quarter_price' => 'nullable|integer',

+ 0 - 3
database/update.sql

@@ -169,9 +169,6 @@ ADD `category_id` int(11) NOT NULL AFTER `id`;
 ALTER TABLE `v2_tutorial`
 DROP `description`;
 
-ALTER TABLE `v2_plan`
-ADD `type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0: 周期 1:一次性' AFTER `name`;
-
 ALTER TABLE `v2_plan`
 CHANGE `month_price` `month_price` int(11) NULL AFTER `content`,
 CHANGE `quarter_price` `quarter_price` int(11) NULL AFTER `month_price`,

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


Some files were not shown because too many files changed in this diff