Nazri Hamzah 7a10f39e70 fix conflict

2018-06-30 16:16:08 +08:00

..

Console

…

Exceptions

fix conflict

2018-05-14 10:45:15 +08:00

Http

fix conflict

2018-06-30 16:16:08 +08:00

Notifications

…

Providers

merge master

2018-05-15 12:35:52 +08:00

Booking.php

added relationship for invoice and booking

2018-06-28 15:22:25 +08:00

ChinaBankSlip.php

added relantionship in chinabankslip model

2018-06-27 16:37:48 +08:00

Invoice.php

added relationship for invoice and booking

2018-06-28 15:22:25 +08:00

Marking.php

Add controller and table for marking

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

OAuthProvider.php

…

Permission.php

added entrust role based permission

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

PurchaseOrder.php

rename book_id in po table to booking_id to perform ORM relantionship

2018-06-28 10:06:26 +08:00

Rate.php

…

Role.php

added entrust role based permission

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

SettingBeneficiary.php

…

SettingCredit.php

get_time_limit

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

SettingSupplier.php

…

SupplierBooking.php

changed model from bookingsupplier to supplier booking

2018-06-27 12:01:49 +08:00

SupplierBookingItem.php

supplier booking (multiple booking removed)

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

User.php

fix admin routes on vuejs

2018-06-21 16:35:09 +08:00

UserBankSlip.php

Add eta

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