Aung Myo
|
dc51beae43
|
fixed conflictfile
|
2017-06-12 15:01:19 +06:30 |
|
Nweni
|
59520bf7ec
|
table status update
|
2017-06-12 14:35:59 +06:30 |
|
Aung Myo
|
e90178cfdc
|
finished CRM and customer
|
2017-06-12 14:23:20 +06:30 |
|
Phyo
|
c7ff5140d4
|
Payment route change
|
2017-06-12 14:22:45 +06:30 |
|
Nweni
|
d2caba3f03
|
fixed conflict
|
2017-06-12 13:27:33 +06:30 |
|
Nweni
|
ee208a5dcd
|
Update
|
2017-06-12 13:26:09 +06:30 |
|
Yan
|
ca2dc181d6
|
add receipt no report and bug fixing
|
2017-06-12 12:04:12 +06:30 |
|
Yan
|
b6bba9ecd4
|
merge conflict
|
2017-06-12 10:55:04 +06:30 |
|
Yan
|
c5e9d7afd5
|
merge with crm
|
2017-06-12 10:25:07 +06:30 |
|
Yan
|
09f9a29cde
|
merge with master
|
2017-06-12 10:01:36 +06:30 |
|
Aung Myo
|
0943808ac8
|
finished order and sales in setting
|
2017-06-12 00:45:59 +06:30 |
|
Yan
|
f834911587
|
to do req_bill_format and status changed after pay
|
2017-06-12 00:45:26 +06:30 |
|
Aung Myo
|
eb001275c7
|
fixed conflict
|
2017-06-11 18:09:00 +06:30 |
|
Aung Myo
|
d65882ac5b
|
crm update
|
2017-06-11 18:00:34 +06:30 |
|
Nweni
|
fc3893f048
|
payment
|
2017-06-11 17:49:06 +06:30 |
|
Nweni
|
f6d14de461
|
fixed conflict
|
2017-06-11 16:58:18 +06:30 |
|
Nweni
|
05286ce7a6
|
payment
|
2017-06-11 16:57:31 +06:30 |
|
Moe Su
|
ee197dba05
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-11 16:12:23 +06:30 |
|
Moe Su
|
29cdcfb28d
|
For Pull
|
2017-06-11 16:11:44 +06:30 |
|
Nweni
|
a809818324
|
other payment
|
2017-06-11 16:10:50 +06:30 |
|
Nweni
|
31cc75462b
|
fixed conflict
|
2017-06-11 15:52:13 +06:30 |
|
Nweni
|
b7bd68a461
|
payment keypad
|
2017-06-11 15:51:22 +06:30 |
|
Moe Su
|
33cc576f1e
|
edit membership setting , otherpayment page
|
2017-06-11 15:48:53 +06:30 |
|
Moe Su
|
596c16d274
|
edit redeem
|
2017-06-11 14:09:19 +06:30 |
|
Moe Su
|
1d24099abc
|
For Pull
|
2017-06-11 13:58:34 +06:30 |
|
Moe Su
|
d49dc3f8c8
|
change route
|
2017-06-11 13:55:14 +06:30 |
|
Nweni
|
7ab9874b80
|
remove migration files
|
2017-06-11 13:20:26 +06:30 |
|
Nweni
|
aa8068ad10
|
Update
|
2017-06-11 13:02:03 +06:30 |
|
Moe Su
|
9f9c83ab7f
|
pay par payment
|
2017-06-11 13:01:03 +06:30 |
|
Yan
|
518e15f5d1
|
update crm
|
2017-06-09 13:54:39 +06:30 |
|
Nweni
|
82de95ca22
|
update
|
2017-06-09 13:52:36 +06:30 |
|
Aung Myo
|
9c228dce5c
|
update view crm
|
2017-06-09 13:26:47 +06:30 |
|
Aung Myo
|
5d89713bb6
|
crm print update
|
2017-06-09 13:24:20 +06:30 |
|
Aung Myo
|
406172c6ff
|
fixed conflict
|
2017-06-09 12:04:36 +06:30 |
|
Aung Myo
|
ba9ebe12de
|
update customer
|
2017-06-09 12:00:46 +06:30 |
|
Yan
|
e7a1687b85
|
update top menu bar for report
|
2017-06-09 11:59:08 +06:30 |
|
Yan
|
e969249e48
|
Merge branch 'report'
|
2017-06-09 11:57:15 +06:30 |
|
Yan
|
367a8694b1
|
update payment
|
2017-06-09 11:57:05 +06:30 |
|
Aung Myo
|
e2e8045d0f
|
update crm layout
|
2017-06-09 11:55:50 +06:30 |
|
Yan
|
fe60ac818f
|
update assets
|
2017-06-09 11:33:21 +06:30 |
|
Nweni
|
6171b00dc7
|
cash payment complete
|
2017-06-09 11:25:30 +06:30 |
|
Yan
|
9771ed2019
|
add report in menu
|
2017-06-09 11:03:14 +06:30 |
|
Yan
|
39c20b221e
|
updated miss origami css and js filename
|
2017-06-09 10:35:19 +06:30 |
|
Aung Myo
|
35277ac000
|
queue and crm view updated
|
2017-06-09 09:29:25 +06:30 |
|
Moe Su
|
5f5e6470c7
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-09 02:40:48 +06:30 |
|
Moe Su
|
c23f726cb3
|
redeem process
|
2017-06-09 02:40:35 +06:30 |
|
Moe Su
|
7702c50675
|
Add membership action
|
2017-06-09 02:23:16 +06:30 |
|
Yan
|
c11b4b7fe0
|
Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-08 19:05:46 +06:30 |
|
Yan
|
43debf4b7e
|
merged with crm
|
2017-06-08 19:04:48 +06:30 |
|
Yan
|
1cbbe9d672
|
Merge branch 'discount'
|
2017-06-08 18:58:28 +06:30 |
|