Commit Graph

55 Commits

Author SHA1 Message Date
omair saleh 05ecbc44fb Merge branch 'booking' into 'master'
Booking

See merge request CIEFWorldwideSdnBhd/exchange-2.0!12
2020-12-08 07:25:18 +00:00
omair saleh 9dcc89fb08 Merge branch 'master' into 'booking'
# Conflicts:
#   app/Classes/Modules/Companies/Services/FetchesCompany.php
#   routes/api.php
2020-12-08 07:25:11 +00:00
omair saleh cd571a00ee clean up api routes 2020-12-07 16:14:24 +08:00
weiken.intex 8d4853c279 temporary don't validate account 2020-12-07 14:22:56 +08:00
weiken.intex 7a31cabfc6 create Transaction & Transaction Detail
- Supplier (AP)
	- PO
	- DO
	- INV

- Customer (AR)
	- PO
	- DO
	- INV
2020-12-07 14:01:08 +08:00
weiken.intex 9ed67e74e2 create Transaction & Transaction Detail
- Supplier (AP)
	- PO
	- DO
	- INV

- Customer (AR)
	- PO
	- DO
	- INV
2020-12-07 14:00:24 +08:00
weiken.intex 3eef8cff25 create Wallet Transaction - integration (convert the amount) 2020-12-07 13:59:10 +08:00
weiken.intex f08a863e2c create Wallet Transaction - integration 2020-12-07 13:59:10 +08:00
weiken.intex 042b8e7ef1 Fixed wallet - integrate 2020-12-07 13:59:10 +08:00
omair saleh 5b7148d879 clean up api routes 2020-12-07 10:44:35 +08:00
CheeSiong db5128735c Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into booking 2020-12-04 09:58:07 +08:00
CheeSiong c3f153fe4b Create Booking Logic Class
Update Booking Logic Class
 Delete Booking Logic Class
2020-12-04 09:49:47 +08:00
omair saleh 2e4b5923e6 Merge branch 'convert_currency' into 'master'
ListCurrencyLogicClass

See merge request CIEFWorldwideSdnBhd/exchange-2.0!11
2020-12-04 01:48:49 +00:00
CheeSiong 5940fd16b0 ListCurrencyLogicClass
Currency Converter Logic Class
2020-12-02 17:31:00 +08:00
omair saleh a0e2632b54 change amount in wallet table to 14 digit with 5 decimal places 2020-12-02 16:19:22 +08:00
omair saleh 0772c5d478 changes made to make the code follow our project coding standers to maintain consistency 2020-12-01 12:57:13 +08:00
omair saleh 5d67c400e3 added new column to company table and added the approval status constant file 2020-11-30 21:44:52 +08:00
omair saleh 8fdadf5209 Merge branch 'currency' into 'master'
Currency

See merge request CIEFWorldwideSdnBhd/exchange-2.0!10
2020-11-30 13:27:35 +00:00
omair saleh 3d6fab48f9 Merge branch 'company_bank' into 'master'
Company bank

See merge request CIEFWorldwideSdnBhd/exchange-2.0!9
2020-11-30 13:27:08 +00:00
changweiken1981 4ab015a516 Ken - Create Company Wallet 2020-11-30 06:38:29 +08:00
changweiken1981 c0314132e7 Ken - Create Company Wallet 2020-11-30 06:38:06 +08:00
CheeSiong dec78bf8d7 Create Currency Logic Class
Update Currency Selling Logic Class
Delete Currency Selling Logic Class
Create Currency Log Service Class
2020-11-29 12:39:36 +08:00
CheeSiong 140067f28b Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into currency 2020-11-29 08:57:36 +08:00
CheeSiong aa6f59b86d -Create Company Bank Logic Class
-Update Company Bank Logic Class
-Delete Company Bank Logic Class
2020-11-27 11:46:25 +08:00
omair saleh 3cc724a7c8 Merge remote-tracking branch 'origin/master' 2020-11-25 20:17:32 +08:00
omair saleh 51623ef690 change the folder name to the correct format 2020-11-25 20:17:12 +08:00
CheeSiong f10545dea4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into company_bank 2020-11-24 14:39:03 +08:00
CheeSiong 83a9cee82d - Add Business Type In Company
- Seeder CLF Company
- DB Migration 4
2020-11-24 14:34:41 +08:00
omair saleh 7475ecdfdf Merge branch 'document' into 'master'
segment constant detail

See merge request CIEFWorldwideSdnBhd/exchange-2.0!5
2020-11-23 04:35:48 +00:00
CheeSiong 2faad9a7f8 segment constant detail 2020-11-22 10:20:38 +08:00
omair saleh 9daca7efb1 Merge branch 'document' into 'master'
Document

See merge request CIEFWorldwideSdnBhd/exchange-2.0!3
2020-11-18 13:42:28 +00:00
CheeSiong 98b354d6b2 document 2020-11-18 10:37:03 +08:00
CheeSiong e2e72de2a7 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into segment 2020-11-17 16:27:19 +08:00
CheeSiong 8b01421be7 -Update Non Standard Segment Logic Class
-Update Non Segment Constant Service Class
-Create Non Standard Segment Constant Logic Class
-Update Non Standard Segment Constant Logic Class
-Delete Non Standard Segment Logic Class
2020-11-17 12:08:10 +08:00
CheeSiong 1fbdc795ff - Segment Company Relationship Service Class
- Update Standard Segment Constant Logic Class
- List Standard Segment Constant Logic Class
- List Standard Segment Logic Class
2020-11-13 14:15:34 +08:00
omair saleh c13b2f1e23 Merge branch 'exchange-1-user-registration' into 'master'
Exchange 1 user registration

See merge request CIEFWorldwideSdnBhd/exchange-2.0!2
2020-11-09 14:33:51 +00:00
CheeSiong 6b394420dc registration step 2 front end 2020-11-06 15:26:53 +08:00
CheeSiong a2381e44a7 User Registration Step 2 Logic Class
Update Company Service Class
Create Documents Service Class
Create File Service Class
Base64 File Convert Service Class
File Upload Storage Service Class
2020-11-05 14:51:56 +08:00
CheeSiong 2bf5de8f3e migrate Document & Content
point constant
2020-11-03 21:03:33 +08:00
CheeSiong 2bc680add9 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into exchange-1-user-registration 2020-11-02 12:49:43 +08:00
CheeSiong b7e995c088 pull 2020-11-02 12:48:44 +08:00
omair saleh 58c34df482 login module 2020-11-02 11:16:08 +08:00
omair saleh e0874ecb06 Merge branch 'exchange-1-user-registration' into 'master'
Exchange 1 user registration

See merge request CIEFWorldwideSdnBhd/exchange-2.0!1
2020-11-02 03:01:22 +00:00
CheeSiong 233d60c2f8 register form step 1 2020-10-30 14:21:00 +08:00
CheeSiong 169ece8f66 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into exchange-1-user-registration 2020-10-27 16:23:28 +08:00
omair saleh 44a20355c0 front-end example for listing users and creating users 2020-10-26 11:48:02 +08:00
CheeSiong eac5ffda7b backend registration step 1 2020-10-24 10:31:52 +08:00
CheeSiong ec4dc051eb Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into exchange-1-user-registration 2020-10-23 13:08:39 +08:00
CheeSiong 4222dc640c pull 2020-10-23 13:08:25 +08:00
omair saleh d93710f962 added missing constant file for http status 2020-10-23 12:59:16 +08:00