Nweni
|
6d4ef8e2ad
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-11 17:49:17 +06:30 |
|
Nweni
|
fc3893f048
|
payment
|
2017-06-11 17:49:06 +06:30 |
|
Moe Su
|
7ac89829d1
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-11 17:40:53 +06:30 |
|
Moe Su
|
7341657477
|
redeem process
|
2017-06-11 17:40:44 +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
|
60b1819220
|
Generating seed
|
2017-06-11 16:47:22 +06:30 |
|
Moe Su
|
fe2a07bf5f
|
Redeem process
|
2017-06-11 16:17:50 +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
|
0e7ed4bc1a
|
edit membership setting , otherpayment page
|
2017-06-11 15:50:31 +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 |
|
Nweni
|
82de95ca22
|
update
|
2017-06-09 13:52:36 +06:30 |
|
Nweni
|
8b99f4844e
|
bill api return updated
|
2017-06-09 13:33:12 +06:30 |
|
Nweni
|
9dd96c7187
|
fixed conflict
|
2017-06-09 13:13:54 +06:30 |
|
Nweni
|
56ffd1f063
|
update sale order talble
|
2017-06-09 13:13:20 +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 |
|
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 |
|
Nweni
|
35553217f5
|
fixed conflict
|
2017-06-09 10:58:40 +06:30 |
|
Nweni
|
56a6d84abe
|
Update
|
2017-06-09 10:57:16 +06:30 |
|
Yan
|
54ef701482
|
updated miss origami css and js filename
|
2017-06-09 10:36:07 +06:30 |
|
Yan
|
39c20b221e
|
updated miss origami css and js filename
|
2017-06-09 10:35:19 +06:30 |
|
Yan
|
1d472aa2e1
|
add req bill seed
|
2017-06-09 10:26:06 +06:30 |
|
Yan
|
015222b575
|
changed orgirami to origami
|
2017-06-09 10:22:55 +06:30 |
|
Yan
|
ba4ec71ec9
|
updated origami js
|
2017-06-09 10:21:30 +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
|
75c8936eff
|
updated default who changed oqs in queue job
|
2017-06-08 19:26:47 +06:30 |
|
Yan
|
43e89cefda
|
re-add account migration
|
2017-06-08 19:12:11 +06:30 |
|
Yan
|
42a29296c7
|
update gem
|
2017-06-08 19:07:20 +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 |
|
Yan
|
71e09ef452
|
comment for cable and add print seed
|
2017-06-08 18:57:53 +06:30 |
|
Moe Su
|
451804366c
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty
|
2017-06-08 18:22:27 +06:30 |
|
Moe Su
|
54e14e02f4
|
Add payment method
|
2017-06-08 18:22:19 +06:30 |
|