 Jack Goh
|
4b79262afe
|
Merge branch 'asif/warehouses' into 'master'
: warehouse and contacts for freight forwarder
See merge request CIEFWorldwideSdnBhd/izyim-api!14
|
2018-08-25 02:09:29 +00:00 |
|
 Mouhamed Lamine
|
24d2383318
|
Dynamic Delivery CRUD FIX
|
2018-08-24 17:19:46 +08:00 |
|
|
Mouhamed Lamine
|
905af4ef8f
|
Delivery CRUD Fix
|
2018-08-21 16:56:47 +08:00 |
|
|
Mouhamed Lamine
|
ede82f860d
|
Delivery Insert Done
|
2018-08-17 11:35:01 +08:00 |
|
|
Mouhamed Lamine
|
2e46ea8c2b
|
Delivery Info Insert
|
2018-08-06 09:30:08 +08:00 |
|
|
Mouhamed Lamine
|
43fdca4bbe
|
Fixed Merge Conflicts
|
2018-08-01 10:57:34 +08:00 |
|
|
Jack Goh
|
c221d786f9
|
updated readme
|
2018-07-18 10:46:57 +08:00 |
|
|
Jack Goh
|
ec537c729b
|
updated readme
|
2018-07-11 12:39:41 +08:00 |
|
|
Jack Goh
|
9a954ddb88
|
fix docker config to wait until db start only start server
|
2018-07-11 12:38:09 +08:00 |
|
 Zain Fauzan Rofie Azizi
|
8fe45348f5
|
relationship path fixed
|
2018-07-06 10:54:12 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
03d84570fa
|
redo contact test, added contact factory
|
2018-07-02 16:50:18 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
7a7e8fdcfe
|
remove warehouse factory file
|
2018-07-02 15:27:26 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
8eebdcd093
|
added company, warehouse, contact seeder
|
2018-07-02 15:24:32 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
e866d7eb0d
|
replaced dockerfile
|
2018-07-02 11:15:02 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
426861e807
|
added seeder
|
2018-07-02 10:48:28 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
020c3ce3b7
|
rollback dockerfile
|
2018-07-02 10:45:20 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
26b5c0c9e5
|
added dockerfile
|
2018-07-02 10:30:53 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
481d18211d
|
remove duplicate line of code
|
2018-06-29 14:55:55 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
70cc220337
|
rename test
|
2018-06-29 11:04:37 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
3adfc6d309
|
Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses
|
2018-06-27 10:00:44 +08:00 |
|
 Aqeeb Imtiaz Harun
|
5c24c159c6
|
Merge branch 'asif/warehouses' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact
# Conflicts:
# app/Http/Controllers/ContactController.php
# routes/api.php
|
2018-06-27 09:51:56 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
4e0eb3528d
|
fixed warehouses FK relation error
|
2018-06-26 16:31:13 +08:00 |
|
|
Aqeeb Imtiaz Harun
|
23f8a4676b
|
Added the search and popup function
|
2018-06-26 14:42:57 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
f6222c6253
|
bug fixing
|
2018-06-26 13:15:42 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
3eb17d397b
|
fixed
|
2018-06-25 16:50:10 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
0a93a6b9fe
|
redo deli info testing
|
2018-06-25 16:43:19 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
48e033f436
|
bug fixing
|
2018-06-25 09:38:03 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
7d51085dae
|
bug fixed
|
2018-06-21 15:24:45 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
90286315f2
|
change to small letter
|
2018-06-20 12:02:45 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
262238f839
|
remove contact function
|
2018-06-20 12:00:26 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
238f21ec1b
|
remove contact function in company model
|
2018-06-20 11:57:32 +08:00 |
|
|
Jack Goh
|
7b76f613ca
|
fix duplicated function for search company
|
2018-06-20 11:33:19 +08:00 |
|
|
Jack Goh
|
c59fb24537
|
Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses
# Conflicts:
# app/Http/Controllers/CompanyController.php
# package-lock.json
# routes/api.php
|
2018-06-20 11:32:02 +08:00 |
|
|
Jack Goh
|
256014c75b
|
fix conflict
|
2018-06-20 11:28:06 +08:00 |
|
|
Jack Goh
|
262884f369
|
merged master
|
2018-06-20 11:26:23 +08:00 |
|
|
Jack Goh
|
7fcf736886
|
remove unsed files
|
2018-06-20 11:12:56 +08:00 |
|
|
Jack Goh
|
49abcb4923
|
Merge branch 'zain/delivery-info' into 'master'
Zain/delivery info
See merge request CIEFWorldwideSdnBhd/izyim-api!4
|
2018-06-20 03:00:40 +00:00 |
|
|
Jack Goh
|
f21c6c9ded
|
commeted out delivery info test TBD
added delivery info index to show lists of delivery info for the company
fixed delivery info show security
|
2018-06-20 11:00:15 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
5fecbf8ade
|
fix seeding for testing
|
2018-06-12 15:23:17 +08:00 |
|
|
Aqeeb Imtiaz Harun
|
eee806bd6d
|
Added search function and frontend of add contacts
|
2018-06-12 13:45:51 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
8037733f2e
|
fixed merged conflict
|
2018-06-12 09:54:54 +08:00 |
|
|
Zain Fauzan Rofie Azizi
|
f463d0b6b2
|
completed the user intergration
|
2018-06-12 09:49:24 +08:00 |
|
|
Aqeeb Imtiaz Harun
|
3c1f2c522d
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact
# Conflicts:
# Dockerfile
# app/Company.php
# app/Http/Controllers/CompanyController.php
# app/Http/Kernel.php
# app/User.php
# composer.json
# composer.lock
# config/app.php
# package-lock.json
# routes/api.php
# tests/TestCase.php
|
2018-06-12 09:28:51 +08:00 |
|
|
Jack Goh
|
c3b02ff4f8
|
Merge branch 'asif/fix-front' into 'master'
fixed personal info frontend
See merge request CIEFWorldwideSdnBhd/izyim-api!12
|
2018-06-08 03:42:05 +00:00 |
|
|
Aqeeb Imtiaz Harun
|
f58bd69d76
|
fixed database issue
|
2018-06-08 11:35:47 +08:00 |
|
 Asif
|
9d501e59b1
|
remove role|change button name|onclick redirect
|
2018-06-08 10:18:46 +08:00 |
|
|
Asif
|
082dd9a871
|
fixed personal info frontend
|
2018-06-08 09:42:28 +08:00 |
|
|
Jack Goh
|
956d1072fa
|
Merge branch 'companyFrontend' into 'master'
Company frontend
See merge request CIEFWorldwideSdnBhd/izyim-api!10
|
2018-06-06 08:52:48 +00:00 |
|
|
Aqeeb Imtiaz Harun
|
c7b8cd76c0
|
added country code added to the front end
|
2018-06-06 16:03:05 +08:00 |
|
|
Aqeeb Imtiaz Harun
|
670eb012ed
|
added alternative bootstrap alert to frontends during the signup process
|
2018-06-06 09:53:26 +08:00 |
|