Commit Graph

  • 2645ec9e97 Merge branch 'asif/contact' of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api into asif/contact asif/contact Mouhamed Lamine 2018-08-25 11:55:45 +08:00
  • 4007c4103d Merge conflicts Fixed Mouhamed Lamine 2018-08-25 11:45:54 +08:00
  • 4b79262afe Merge branch 'asif/warehouses' into 'master' master Jack Goh 2018-08-25 02:09:29 +00:00
  • 24d2383318 Dynamic Delivery CRUD FIX Mouhamed Lamine 2018-08-24 17:19:46 +08:00
  • 905af4ef8f Delivery CRUD Fix Mouhamed Lamine 2018-08-21 16:56:47 +08:00
  • ede82f860d Delivery Insert Done Mouhamed Lamine 2018-08-17 11:35:01 +08:00
  • 7852eea2fb update personal information and company information fix/bug Surendran 2018-08-11 12:50:24 +08:00
  • e34df92ef6 changed files according to discussions on Gitlab and tweaked search function Aqeeb Imtiaz Harun 2018-08-06 15:10:25 +08:00
  • 2e46ea8c2b Delivery Info Insert Mouhamed Lamine 2018-08-06 09:30:08 +08:00
  • f4763b9b29 fixed the listing of the contacts page Aqeeb Imtiaz Harun 2018-08-03 12:32:30 +08:00
  • cb8ce07406 display user profile and company profile Surendran 2018-08-01 18:25:57 +08:00
  • 43fdca4bbe Fixed Merge Conflicts Mouhamed Lamine 2018-08-01 10:57:34 +08:00
  • dd5c5d7f20 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into fix/bug Surendran 2018-07-19 12:39:15 +08:00
  • 2eaab2b061 rename database Surendran 2018-07-18 17:47:58 +08:00
  • c221d786f9 updated readme Jack Goh 2018-07-18 10:46:57 +08:00
  • 3fc889cd97 remove one dispaly box Zain Fauzan Rofie Azizi 2018-07-18 10:00:20 +08:00
  • 450ca7ac7e need to run php artisan jwt:secret if 1st time run the code Zain Fauzan Rofie Azizi 2018-07-17 15:23:54 +08:00
  • 6db0392277 place the alert name Zain Fauzan Rofie Azizi 2018-07-17 12:06:07 +08:00
  • 4694ddbbf1 fixed merged conflicts Zain Fauzan Rofie Azizi 2018-07-17 11:11:06 +08:00
  • 9e173e7591 added function to show the list of warehouse receive note list zain/warehouse-receive-note Zain Fauzan Rofie Azizi 2018-07-12 15:41:06 +08:00
  • f67ee93a80 return single data only rather than all data Zain Fauzan Rofie Azizi 2018-07-12 14:54:07 +08:00
  • bde5a53741 change to capital letter Zain Fauzan Rofie Azizi 2018-07-12 14:50:37 +08:00
  • 99760493cb rename path in decison model Zain Fauzan Rofie Azizi 2018-07-12 14:45:26 +08:00
  • 683fcd1bf1 rename decsion item model, file Zain Fauzan Rofie Azizi 2018-07-12 14:44:43 +08:00
  • ec537c729b updated readme Jack Goh 2018-07-11 12:39:41 +08:00
  • 9a954ddb88 fix docker config to wait until db start only start server Jack Goh 2018-07-11 12:38:09 +08:00
  • b337af1b7c The current user settings for the contact page has been attempted to be fixed, still have 1 issue with listing & the sidemenu Aqeeb Imtiaz Harun 2018-07-07 17:30:55 +08:00
  • 7d9e4a3c0f Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact Aqeeb Imtiaz Harun 2018-07-07 17:24:36 +08:00
  • 1759b088a3 changed the listing function on contacts frontend, still got issues Aqeeb Imtiaz Harun 2018-07-06 18:05:12 +08:00
  • 8fe45348f5 relationship path fixed Zain Fauzan Rofie Azizi 2018-07-06 10:54:12 +08:00
  • 47b6b70744 remove success Zain Fauzan Rofie Azizi 2018-07-06 10:08:28 +08:00
  • 87478d1572 return error with json Zain Fauzan Rofie Azizi 2018-07-06 10:01:17 +08:00
  • bd73f0b447 fixed undefine variable Zain Fauzan Rofie Azizi 2018-07-05 15:58:23 +08:00
  • 750a6e0db9 bug fixing Zain Fauzan Rofie Azizi 2018-07-04 15:42:58 +08:00
  • 04d4f5c521 rename warehouse arrangement routes, controller Zain Fauzan Rofie Azizi 2018-07-04 10:38:34 +08:00
  • 69f1bac8dc fixed merged conflicts zain/shipping-order Zain Fauzan Rofie Azizi 2018-07-04 10:27:22 +08:00
  • 7f489ffd68 add security check for user Zain Fauzan Rofie Azizi 2018-07-04 10:25:23 +08:00
  • c8a79a40fe fetching branchname and popup zain/delivery-info Asif 2018-07-02 22:25:51 +08:00
  • 5a53824bb6 pull from warehouses Zain Fauzan Rofie Azizi 2018-07-02 17:09:13 +08:00
  • 03d84570fa redo contact test, added contact factory Zain Fauzan Rofie Azizi 2018-07-02 16:50:18 +08:00
  • 7a7e8fdcfe remove warehouse factory file Zain Fauzan Rofie Azizi 2018-07-02 15:27:26 +08:00
  • 8eebdcd093 added company, warehouse, contact seeder Zain Fauzan Rofie Azizi 2018-07-02 15:24:32 +08:00
  • e866d7eb0d replaced dockerfile Zain Fauzan Rofie Azizi 2018-07-02 11:15:02 +08:00
  • 5412e1aa50 Added listing of Contacts frontend Aqeeb Imtiaz Harun 2018-07-02 10:50:20 +08:00
  • 426861e807 added seeder Zain Fauzan Rofie Azizi 2018-07-02 10:48:28 +08:00
  • 020c3ce3b7 rollback dockerfile Zain Fauzan Rofie Azizi 2018-07-02 10:45:20 +08:00
  • 26b5c0c9e5 added dockerfile Zain Fauzan Rofie Azizi 2018-07-02 10:30:53 +08:00
  • 481d18211d remove duplicate line of code Zain Fauzan Rofie Azizi 2018-06-29 14:55:55 +08:00
  • 8054831b5c Edited Contacts Page Aqeeb Imtiaz Harun 2018-06-29 11:04:39 +08:00
  • 70cc220337 rename test Zain Fauzan Rofie Azizi 2018-06-29 11:04:37 +08:00
  • ae66e3bc32 added Contacts page frontend and search contacts page is complete Aqeeb Imtiaz Harun 2018-06-29 10:23:34 +08:00
  • 7a23b4ed3c merged conflict Zain Fauzan Rofie Azizi 2018-06-28 17:11:56 +08:00
  • cbb15ac3ed added comments to shipping order controller and test Jack Goh 2018-06-28 17:08:50 +08:00
  • e8b2b8009b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into zain/shipping-order Jack Goh 2018-06-28 16:58:01 +08:00
  • 94327b6a4d updated docker removed unused files Jack Goh 2018-06-28 16:51:21 +08:00
  • be09fcb3d2 fixed typo error Zain Fauzan Rofie Azizi 2018-06-27 11:25:10 +08:00
  • 93a5e93ce2 added fk for wrn, added user inetrgration Zain Fauzan Rofie Azizi 2018-06-27 11:22:34 +08:00
  • 3adfc6d309 Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses Zain Fauzan Rofie Azizi 2018-06-27 10:00:44 +08:00
  • 5c24c159c6 Merge branch 'asif/warehouses' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact Aqeeb Imtiaz Harun 2018-06-27 09:51:56 +08:00
  • 4e0eb3528d fixed warehouses FK relation error Zain Fauzan Rofie Azizi 2018-06-26 16:31:13 +08:00
  • 74fe5082a5 checkout Zain Fauzan Rofie Azizi 2018-06-26 16:13:39 +08:00
  • fb21c24093 test Zain Fauzan Rofie Azizi 2018-06-26 16:11:46 +08:00
  • 23f8a4676b Added the search and popup function Aqeeb Imtiaz Harun 2018-06-26 14:42:57 +08:00
  • f6222c6253 bug fixing Zain Fauzan Rofie Azizi 2018-06-26 13:15:42 +08:00
  • 1446590171 complete cancel ship order Zain Fauzan Rofie Azizi 2018-06-26 09:49:54 +08:00
  • 3eb17d397b fixed Zain Fauzan Rofie Azizi 2018-06-25 16:50:10 +08:00
  • 0a93a6b9fe redo deli info testing Zain Fauzan Rofie Azizi 2018-06-25 16:43:19 +08:00
  • 48e033f436 bug fixing Zain Fauzan Rofie Azizi 2018-06-25 09:38:03 +08:00
  • 7d51085dae bug fixed Zain Fauzan Rofie Azizi 2018-06-21 15:24:45 +08:00
  • 90286315f2 change to small letter Zain Fauzan Rofie Azizi 2018-06-20 12:02:45 +08:00
  • 262238f839 remove contact function Zain Fauzan Rofie Azizi 2018-06-20 12:00:26 +08:00
  • 238f21ec1b remove contact function in company model Zain Fauzan Rofie Azizi 2018-06-20 11:57:32 +08:00
  • 7b76f613ca fix duplicated function for search company Jack Goh 2018-06-20 11:33:19 +08:00
  • c59fb24537 Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses Jack Goh 2018-06-20 11:32:02 +08:00
  • 256014c75b fix conflict Jack Goh 2018-06-20 11:28:06 +08:00
  • 262884f369 merged master Jack Goh 2018-06-20 11:26:23 +08:00
  • efdf546885 solved some user id error, added fk id Zain Fauzan Rofie Azizi 2018-06-20 11:21:13 +08:00
  • 7fcf736886 remove unsed files Jack Goh 2018-06-20 11:12:56 +08:00
  • c917811978 Merge branch 'zain/delivery-info' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into zain/delivery-info Asif 2018-06-20 11:05:04 +08:00
  • 292197ab51 post method Asif 2018-06-20 11:04:46 +08:00
  • 49abcb4923 Merge branch 'zain/delivery-info' into 'master' Jack Goh 2018-06-20 03:00:40 +00:00
  • 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 Jack Goh 2018-06-20 11:00:15 +08:00
  • e404076e3a add use auth Asif 2018-06-12 15:24:26 +08:00
  • 5fecbf8ade fix seeding for testing Zain Fauzan Rofie Azizi 2018-06-12 15:23:17 +08:00
  • eee806bd6d Added search function and frontend of add contacts Aqeeb Imtiaz Harun 2018-06-12 13:45:51 +08:00
  • 8c99576535 add migration Asif 2018-06-12 11:57:50 +08:00
  • 8037733f2e fixed merged conflict Zain Fauzan Rofie Azizi 2018-06-12 09:54:54 +08:00
  • f463d0b6b2 completed the user intergration Zain Fauzan Rofie Azizi 2018-06-12 09:49:24 +08:00
  • 3c1f2c522d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact Aqeeb Imtiaz Harun 2018-06-12 09:28:51 +08:00
  • 576fdc2534 incomplete Zain Fauzan Rofie Azizi 2018-06-09 10:42:58 +08:00
  • c3b02ff4f8 Merge branch 'asif/fix-front' into 'master' Jack Goh 2018-06-08 03:42:05 +00:00
  • f58bd69d76 fixed database issue Aqeeb Imtiaz Harun 2018-06-08 11:35:47 +08:00
  • 9d501e59b1 remove role|change button name|onclick redirect Asif 2018-06-08 10:18:46 +08:00
  • 082dd9a871 fixed personal info frontend Asif 2018-06-08 09:42:28 +08:00
  • 0226847eea dropped order_id column in soitem table Zain Fauzan Rofie Azizi 2018-06-07 17:21:08 +08:00
  • 18c05ecb7d fixed group routes Zain Fauzan Rofie Azizi 2018-06-07 15:48:05 +08:00
  • 706221589a Merge branch 'zain/shipping-order' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/shippingorder-frontend Aqeeb/shippingorder-frontend Aqeeb Imtiaz Harun 2018-06-07 11:45:36 +08:00
  • d4d5d39ec1 Fixed conflict Aqeeb Imtiaz Harun 2018-06-07 11:04:32 +08:00
  • 59d9588fdc updated codes Zain Fauzan Rofie Azizi 2018-06-07 11:03:46 +08:00
  • 44bd05c03b Merge branch 'zain/shipping-order' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/shippingorder-frontend Aqeeb Imtiaz Harun 2018-06-07 11:03:27 +08:00