Jack Goh d362d947a3 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip ...

# Conflicts:
#	app/Http/Controllers/BookingController.php

2018-06-27 09:56:35 +08:00

..

2014_10_12_000000_create_users_table.php

added wait for mysql to start in docker

2018-05-14 12:45:30 +08:00

2014_10_12_100000_create_password_resets_table.php

added wait for mysql to start in docker

2018-05-14 12:45:30 +08:00

2017_12_07_122845_create_oauth_providers_table.php

integrated frontend

2018-05-07 15:26:23 +08:00

2018_04_25_085705_create_rates_table.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

2018_04_25_090015_create_setting_credits_table.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

2018_04_25_090031_create_setting_suppliers_table.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

2018_04_25_090057_create_setting_beneficiaries_table.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

2018_05_07_080525_entrust_setup_tables.php

added entrust role based permission

2018-05-07 16:25:42 +08:00

2018_05_08_032048_create_china_bank_slips_table.php

customer booking bank slip

2018-05-28 10:58:40 +08:00

2018_05_15_075453_create_bookings_table.php

input data inside database using seeder

2018-05-17 15:13:29 +08:00

2018_05_15_090646_change_user_id_in_bookings_table.php

booking test

2018-05-23 11:49:32 +08:00

2018_05_18_063200_add_bia_in_bookings_table.php

Fix test

2018-06-13 15:57:08 +08:00

2018_05_22_032509_add_bookings_table.php

booking test updated

2018-05-23 12:11:28 +08:00

2018_05_22_032509_make_nullable_field_bookings_table.php

fix running routes:cache error

2018-06-18 22:37:33 +08:00

2018_05_24_082214_create_user_bank_slips_table.php

add logic, test

2018-05-30 16:33:11 +08:00

2018_05_28_085925_create_purchase_orders_table.php

fix discussion

2018-05-30 12:24:30 +08:00

2018_05_30_030248_update_upload_booking_bankslip.php

add logic, test

2018-05-30 16:33:11 +08:00

2018_06_16_025657_add_cancel_booking_table.php

New Route for booking cancel. Fix bookingTest hardcoded link. Add Cancel function to bookingcontroller. Get Latest Rate for bookingController@store.

2018-06-16 14:40:39 +08:00

2018_06_18_104015_add_reject_user_bank_slip_table.php

Reject user bank slip with reason. Add migration for userbankslip.

2018-06-18 18:57:27 +08:00

2018_06_18_141410_rename_book_id_to_booking_id_in_userbankslip_table.php

fix running routes:cache error

2018-06-18 22:37:33 +08:00

2018_06_19_144347_create_marking_table.php

Add controller and table for marking

2018-06-20 00:38:32 +08:00

2018_06_20_145105_add_rate_to_booking.php

added rate to booking table

2018-06-20 22:54:31 +08:00

2018_06_21_024658_supplierbooking_customerbooking_table.php

supplier booking (multiple booking removed)

2018-06-26 18:17:38 +08:00

2018_06_21_024802_add_status_to_booking_table.php

added status column to booking table

2018-06-21 10:49:45 +08:00

2018_06_21_025734_supplier_booking_table.php

supplier booking (multiple booking removed)

2018-06-26 18:17:38 +08:00

2018_06_21_040652_create_invoice_table.php

rename image_url to image_path in user_bank_slip,invoice,purchase_order

2018-06-21 14:36:33 +08:00

2018_06_21_062637_rename_imageurl_to_imagepath_in_userbankslips_table.php

rename image_url to image_path in user_bank_slip,invoice,purchase_order

2018-06-21 14:36:33 +08:00

2018_06_21_062700_rename_imageurl_to_imagepath_in_purchaseorders_table.php

rename image_url to image_path in user_bank_slip,invoice,purchase_order

2018-06-21 14:36:33 +08:00

2018_06_21_072354_remove_amountcolumn_from_po_table.php

removed amount from uploadpo

2018-06-21 15:48:24 +08:00

2018_06_22_042127_add_adminstatus_to_booking_table.php

added admin status to booking table

2018-06-22 12:31:51 +08:00

2018_06_22_042911_change_adminstatus_default_booking_table.php

added admin status to booking table

2018-06-22 12:31:51 +08:00

2018_06_25_075341_change_adminstatus_default_to1_on_booking_table.php

changed admin status default to 1

2018-06-25 16:41:31 +08:00

2018_06_25_101043_add_time_limit_setting_credit_table.php

get_time_limit

2018-06-25 18:16:20 +08:00

2018_06_25_120731_create_supplier_booking_items_table.php

supplier booking (multiple booking removed)

2018-06-26 18:17:38 +08:00

2018_06_26_035802_add_eta_user_bank_slip_table.php

fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller

2018-06-26 12:28:17 +08:00

2018_06_26_141337_rename_bankslip_url_to_chinabanksli_path_in_china_bank_slip_table.php

Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table

2018-06-26 22:23:10 +08:00