diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 7d8c6bf2..6f8110c2 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -46,6 +46,12 @@ class BookingController extends Controller $booking->transfer_amount = $booking->bia; $booking->track_status = "(". $booking->status ."/7)"; + + // all x2 until step 5 only + if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba") { + $booking->track_status = "(". $booking->status ."/5)"; + } + switch ($booking->status) { case 1: $status_desc = "Order in progress"; @@ -61,6 +67,9 @@ class BookingController extends Controller break; case 5: $status_desc = "Transfer Complete, please upload your PO"; + if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){ + $status_desc = "Order Completed"; + } break; case 6: $status_desc = "Processing invoice"; @@ -102,9 +111,8 @@ class BookingController extends Controller $booking->transfer_amount = $booking->bia; $term = $booking->term; - if($term == "x1_ba" || $term == "x2_cheque"){ - $status = $booking->admin_status > 2 ? $booking->admin_status - 2 : $booking->admin_status; - $booking->track_status = "(". $status ."/5)"; + if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){ + $booking->track_status = "(". $booking->admin_status ."/6)"; } else{ $booking->track_status = "(". $booking->admin_status ."/7)"; @@ -118,20 +126,19 @@ class BookingController extends Controller $status_desc = "Verify user bank slip"; break; case 3: - if($term !== "x1_ba" || $term !== "x2_cheque"){ - $status_desc = "Generate supplier booking report"; - break; - } + $status_desc = "Generate supplier booking report"; + break; case 4: - if($term !== "x1_ba" || $term !== "x2_cheque"){ - $status_desc = "Supplier booking report. Please confirm with your booking."; - break; - } + $status_desc = "Supplier booking report. Please confirm with your booking."; + break; case 5: $status_desc = "Please, upload China Bankslip"; break; - case 6: - $status_desc = "Waiting customer to upload purchase order"; + case 6: + $status_desc = "Waiting customer to upload purchase order"; + if ($booking->term == "x2_cash" || $booking->term == "x2_cheque" || $booking->term == "x2_ba"){ + $status_desc = "Order Completed"; + } break; case 7: $status_desc = "Customer has uploaded purchase order, please upload invoice"; diff --git a/database/migrations/2018_08_08_103115_make_nullable_in_bookings_table.php b/database/migrations/2018_08_08_103115_make_nullable_in_bookings_table.php new file mode 100644 index 00000000..d8524e66 --- /dev/null +++ b/database/migrations/2018_08_08_103115_make_nullable_in_bookings_table.php @@ -0,0 +1,37 @@ +string('company_name')->nullable()->change(); + $table->string('company_address')->nullable()->change(); + $table->string('bank_address')->nullable()->change(); + $table->string('swift_code')->nullable()->change(); + $table->string('cnap')->nullable()->change(); + $table->string('term')->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('bookings', function (Blueprint $table) { + // + }); + } +} diff --git a/database/migrations/2018_08_08_104726_make_nullable_in_supplier_bookings_table.php b/database/migrations/2018_08_08_104726_make_nullable_in_supplier_bookings_table.php new file mode 100644 index 00000000..6c91e5f7 --- /dev/null +++ b/database/migrations/2018_08_08_104726_make_nullable_in_supplier_bookings_table.php @@ -0,0 +1,33 @@ +decimal('transfer_amount')->nullable()->change(); + $table->decimal('rmbBankAmount')->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('supplier_bookings', function (Blueprint $table) { + // + }); + } +} diff --git a/database/seeds/BookTableSeeder.php b/database/seeds/BookTableSeeder.php index 9bbc0d9a..e27ff224 100644 --- a/database/seeds/BookTableSeeder.php +++ b/database/seeds/BookTableSeeder.php @@ -35,7 +35,7 @@ class BookTableSeeder extends Seeder 'rate_id' => $rate->id, 'user_id' => $user->id, 'status' => 2, - 'admin_status' => 2, + 'admin_status' => 1, 'order_no' => '001', 'payment_for' => 'FULL PAYMENT', 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), diff --git a/database/seeds/NotificationSeeder.php b/database/seeds/NotificationSeeder.php index ac238997..316b11ad 100644 --- a/database/seeds/NotificationSeeder.php +++ b/database/seeds/NotificationSeeder.php @@ -19,7 +19,7 @@ class NotificationSeeder extends Seeder DB::table('notifications')->insert([ 'detail' => 'This is an user seeder notification', 'user_id' => $user->id, - 'link' => 'http://www.google.com', + 'link' => '/', 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), ]); @@ -27,7 +27,7 @@ class NotificationSeeder extends Seeder DB::table('notifications')->insert([ 'detail' => 'This is an admin seeder notification', 'user_id' => $admin->id, - 'link' => 'http://www.google.com', + 'link' => '/', 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), ]); diff --git a/resources/assets/js/components/AdminProgressTrack.vue b/resources/assets/js/components/AdminProgressTrack.vue index 3a0a6507..4b32b289 100644 --- a/resources/assets/js/components/AdminProgressTrack.vue +++ b/resources/assets/js/components/AdminProgressTrack.vue @@ -3,10 +3,10 @@ - - + + - + diff --git a/resources/assets/js/components/ProgressTrack.vue b/resources/assets/js/components/ProgressTrack.vue index 21241dfb..f7238a85 100644 --- a/resources/assets/js/components/ProgressTrack.vue +++ b/resources/assets/js/components/ProgressTrack.vue @@ -1,12 +1,12 @@