diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 67ff2454..6048e53c 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -22,6 +22,7 @@ class BookingController extends Controller $user = Auth::user(); $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('user_id', $user->id) + ->orderby('updated_at','desc') ->paginate(10); @@ -77,7 +78,8 @@ class BookingController extends Controller public function adminIndex(){ $user = Auth::user(); $bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') - ->get(); + ->orderby('updated_at','desc') + ->get(); // reformat to fit frontend structure foreach ($bookings as $booking) { @@ -524,6 +526,16 @@ class BookingController extends Controller $term = $request->input('term'); $china_beneficiary = $request->input('china_beneficiary'); $rates = Rate::orderby('updated_at','desc')->first(); + + $creditLimit = SettingCredit::orderby('updated_at','desc')->first(); + + if (!$creditLimit){ + return response()->json("Credit limit not set, please contact admin", 405); + } + + if($amount > $creditLimit->rmb_credit_limit){ + return response()->json(["message" => "Exceed credit limit, please contact our sales team for larger quantitiy"], 400); + } // TODO : get marking $marking = "123X"; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index c3400b61..851428ef 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -29,7 +29,7 @@ class CreateUsersTable extends Migration * @return void */ public function down() - { - + { + Schema::drop('users'); } } diff --git a/database/migrations/2018_04_25_085705_create_rates_table.php b/database/migrations/2018_04_25_085705_create_rates_table.php index 41f4383b..c671b6e7 100644 --- a/database/migrations/2018_04_25_085705_create_rates_table.php +++ b/database/migrations/2018_04_25_085705_create_rates_table.php @@ -32,6 +32,6 @@ class CreateRatesTable extends Migration */ public function down() { - + Schema::dropIfExists('rates'); } } diff --git a/database/migrations/2018_05_15_075453_create_bookings_table.php b/database/migrations/2018_05_15_075453_create_bookings_table.php index b544e80b..53b4988f 100644 --- a/database/migrations/2018_05_15_075453_create_bookings_table.php +++ b/database/migrations/2018_05_15_075453_create_bookings_table.php @@ -41,8 +41,14 @@ class CreateBookingsTable extends Migration * @return void */ public function down() - { + { + Schema::table('bookings', function(Blueprint $table) + { + $table->dropForeign('bookings_rate_id_foreign'); + $table->dropColumn('rate_id'); + }); + Schema::dropIfExists('bookings'); } } diff --git a/database/migrations/2018_05_15_090646_change_user_id_in_bookings_table.php b/database/migrations/2018_05_15_090646_change_user_id_in_bookings_table.php index d629bc96..af1c5a67 100644 --- a/database/migrations/2018_05_15_090646_change_user_id_in_bookings_table.php +++ b/database/migrations/2018_05_15_090646_change_user_id_in_bookings_table.php @@ -29,6 +29,10 @@ class ChangeUserIdInBookingsTable extends Migration */ public function down() { - + Schema::table('bookings', function(Blueprint $table) + { + $table->dropForeign('bookings_user_id_foreign'); + $table->dropColumn('user_id'); + }); } } diff --git a/database/migrations/2018_05_22_032509_add_bookings_table.php b/database/migrations/2018_05_22_032509_add_bookings_table.php index f6943b72..824991f8 100644 --- a/database/migrations/2018_05_22_032509_add_bookings_table.php +++ b/database/migrations/2018_05_22_032509_add_bookings_table.php @@ -28,11 +28,7 @@ class AddBookingsTable extends Migration $table->string('usd_book_swift_code')->default(' '); $table->string('usd_book_cnap')->default(' '); $table->string('usd_book_bank_branch')->default(' '); - $table->boolean('verification_status')->default('1'); // Results in a default value of 1. - - // $table->foreign('status_id') - // ->references('id')->on('status') - // ->onDelete('cascade'); + $table->boolean('verification_status')->default('1'); }); } @@ -43,8 +39,6 @@ class AddBookingsTable extends Migration */ public function down() { - Schema::table('bookings', function (Blueprint $table) { - // - }); + } } diff --git a/database/migrations/2018_05_22_032509_make_nullable_field_bookings_table.php b/database/migrations/2018_05_22_032509_make_nullable_field_bookings_table.php index f29743dc..4afb7784 100644 --- a/database/migrations/2018_05_22_032509_make_nullable_field_bookings_table.php +++ b/database/migrations/2018_05_22_032509_make_nullable_field_bookings_table.php @@ -28,11 +28,7 @@ class MakeNullableFieldBookingsTable extends Migration $table->string('usd_book_swift_code')->nullable()->change(); $table->string('usd_book_cnap')->nullable()->change(); $table->string('usd_book_bank_branch')->nullable()->change(); - $table->boolean('verification_status')->nullable()->change(); // Results in a default value of 1. - - // $table->foreign('status_id') - // ->references('id')->on('status') - // ->onDelete('cascade'); + $table->boolean('verification_status')->nullable()->change(); }); } diff --git a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php index 0d11cdd5..b8ba0913 100644 --- a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php +++ b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php @@ -34,6 +34,11 @@ class CreateUserBankSlipsTable extends Migration */ public function down() { + Schema::table('user_bank_slips', function(Blueprint $table) + { + $table->dropForeign('user_bank_slips_book_id_foreign'); + }); + Schema::dropIfExists('user_bank_slips'); } } diff --git a/database/migrations/2018_05_28_085925_create_purchase_orders_table.php b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php index 08ebcbd2..a96688c3 100644 --- a/database/migrations/2018_05_28_085925_create_purchase_orders_table.php +++ b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php @@ -30,6 +30,11 @@ class CreatePurchaseOrdersTable extends Migration */ public function down() { + Schema::table('purchase_orders', function(Blueprint $table) + { + $table->dropForeign('purchase_orders_booking_id_foreign'); + $table->dropColumn('booking_id'); + }); Schema::dropIfExists('purchase_orders'); } } diff --git a/database/migrations/2018_06_19_144347_create_marking_table.php b/database/migrations/2018_06_19_144347_create_marking_table.php index d4ec40ad..361d8466 100644 --- a/database/migrations/2018_06_19_144347_create_marking_table.php +++ b/database/migrations/2018_06_19_144347_create_marking_table.php @@ -28,6 +28,6 @@ class CreateMarkingTable extends Migration */ public function down() { - Schema::dropIfExists('marking'); + Schema::dropIfExists('markings'); } } diff --git a/database/migrations/2018_06_21_040652_create_invoice_table.php b/database/migrations/2018_06_21_040652_create_invoice_table.php index ab3a8e48..86b7002f 100644 --- a/database/migrations/2018_06_21_040652_create_invoice_table.php +++ b/database/migrations/2018_06_21_040652_create_invoice_table.php @@ -30,6 +30,12 @@ class CreateInvoiceTable extends Migration */ public function down() { + Schema::table('invoices', function(Blueprint $table) + { + $table->dropForeign('invoices_booking_id_foreign'); + $table->dropColumn('booking_id'); + }); + Schema::dropIfExists('invoices'); } } diff --git a/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php b/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php index 5a184094..e46794c8 100644 --- a/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php +++ b/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php @@ -27,6 +27,10 @@ class AddBookingidForeignkeyToChinabankslipTable extends Migration */ public function down() { - // + Schema::table('china_bank_slips', function(Blueprint $table) + { + $table->dropForeign('china_bank_slips_booking_id_foreign'); + $table->dropColumn('booking_id'); + }); } } diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue index 16a54033..0b866293 100644 --- a/resources/assets/js/components/LocaleDropdown.vue +++ b/resources/assets/js/components/LocaleDropdown.vue @@ -1,7 +1,7 @@