Aung Myo
|
622aa4f121
|
update origami js and index
|
2017-06-12 15:39:38 +06:30 |
|
Aung Myo
|
dc51beae43
|
fixed conflictfile
|
2017-06-12 15:01:19 +06:30 |
|
Nweni
|
105581a7de
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-12 14:23:29 +06:30 |
|
Aung Myo
|
e90178cfdc
|
finished CRM and customer
|
2017-06-12 14:23:20 +06:30 |
|
Nweni
|
b12b52d754
|
update table status
|
2017-06-12 14:23:18 +06:30 |
|
Phyo
|
c7ff5140d4
|
Payment route change
|
2017-06-12 14:22:45 +06:30 |
|
Moe Su
|
b0eb92b043
|
Seed
|
2017-06-12 14:19:04 +06:30 |
|
Moe Su
|
3e531f68a9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-12 14:16:42 +06:30 |
|
Moe Su
|
dd5de68bc0
|
Seed
|
2017-06-12 14:16:31 +06:30 |
|
Yan
|
7122fb4c81
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-12 14:15:16 +06:30 |
|
Yan
|
4212ad45b3
|
updated for food and beverage bugs
|
2017-06-12 14:11:13 +06:30 |
|
Moe Su
|
228ff44e5c
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-12 13:58:24 +06:30 |
|
Moe Su
|
a2111f1635
|
For Pull
|
2017-06-12 13:58:16 +06:30 |
|
Nweni
|
917ccd0294
|
booking update
|
2017-06-12 13:48:54 +06:30 |
|
Moe Su
|
75e363ed12
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-12 13:33:21 +06:30 |
|
Moe Su
|
c6b72a112b
|
For Pull
|
2017-06-12 13:31:01 +06:30 |
|
Nweni
|
a96444518a
|
fixed conflict
|
2017-06-12 13:28:16 +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
|
e1481eb591
|
update route after merge with crm
|
2017-06-12 10:27:53 +06:30 |
|
Yan
|
c5e9d7afd5
|
merge with crm
|
2017-06-12 10:25:07 +06:30 |
|
Yan
|
121fb92b9b
|
update orgami js
|
2017-06-12 10:12:55 +06:30 |
|
Yan
|
09f9a29cde
|
merge with master
|
2017-06-12 10:01:36 +06:30 |
|
Nweni
|
5ee3ae257a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-12 09:20:50 +06:30 |
|
Nweni
|
3f3d37756d
|
update
|
2017-06-12 09:20:38 +06:30 |
|
Min Zeya Phyo
|
7eaea8f08d
|
fixed jsonb to json to support both mysql and postgres
|
2017-06-12 07:40:40 +06:30 |
|
Min Zeya Phyo
|
a2fcd0c44e
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
# Gemfile.lock
|
2017-06-12 07:34:05 +06:30 |
|
Min Zeya Phyo
|
137267514b
|
bundle gemlock
|
2017-06-12 07:21:09 +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
|
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 |
|