San Wai Lwin
|
1188f6e8e9
|
Pull from master
|
2018-03-15 13:48:52 +06:30 |
|
phyusin
|
bd06e80b37
|
remove conflict data
|
2018-03-05 16:24:45 +06:30 |
|
San Wai Lwin
|
07c3bcd7a7
|
Change Dashboard, Account in login, Shop name, Reference no for other charges
|
2018-02-28 15:31:55 +06:30 |
|
Aung Myo
|
f4f5915532
|
update waiter view add order
|
2018-02-26 09:19:14 +06:30 |
|
Aung Myo
|
4ebe353182
|
update conflix for request bill
|
2018-02-20 16:24:06 +06:30 |
|
Aung Myo
|
98c4737a2a
|
fixed minor issuse
|
2018-02-20 16:09:11 +06:30 |
|
Aung Myo
|
8f239cbb0b
|
update conflix for request bill
|
2018-02-20 13:32:27 +06:30 |
|
Aung Myo
|
a5640877a3
|
update request bill
|
2018-02-20 11:59:57 +06:30 |
|
Aung Myo
|
31adc0e993
|
update request bill for another role in request_bill_con and sale.rb
|
2018-02-20 11:13:49 +06:30 |
|
Aung Myo
|
6d7da7f997
|
update request bill controller
|
2018-02-20 11:07:00 +06:30 |
|
Aung Myo
|
a2d0aee1ab
|
update applicaton contro and request bill
|
2018-02-20 09:37:30 +06:30 |
|
San Wai Lwin
|
3f247f731e
|
Shop name in navbar,linke to shop info
|
2018-02-05 18:11:45 +06:30 |
|
Yan
|
25fef8e61c
|
check req bill cntrl
|
2017-11-16 21:12:16 +06:30 |
|
yamin
|
1aea52619a
|
UI change
|
2017-10-23 11:38:10 +06:30 |
|
Yan
|
5ba3a69c3f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-10-11 10:03:30 +06:30 |
|
Yan
|
8933dde41d
|
add promotion activation in cashier req bill
|
2017-10-10 15:53:08 +06:30 |
|
Aung Myo
|
444b270dd1
|
update ui design
|
2017-09-29 13:42:41 +06:30 |
|
Yan
|
23faf65af6
|
add shift id after req bill
|
2017-08-01 18:41:53 +06:30 |
|
Yan
|
c73cfa4c2d
|
control to req bill and discount ui update
|
2017-07-08 23:29:31 +06:30 |
|
Nweni
|
e3c2f02c81
|
fixed conflict
|
2017-06-29 13:39:37 +06:30 |
|
Nweni
|
618a89472a
|
shift open/close
|
2017-06-29 13:35:09 +06:30 |
|
Yan
|
9991970203
|
add first bill
|
2017-06-29 11:34:13 +06:30 |
|
Yan
|
5ff75fad7d
|
fix for undefied method type in item pdf
|
2017-06-28 15:40:54 +06:30 |
|
Yan
|
034c9932a6
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 18:45:55 +06:30 |
|
Aung Myo
|
02e3ebefda
|
update receipt
|
2017-06-26 17:56:31 +06:30 |
|
Yan
|
ecc9ab53ec
|
Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 09:59:16 +06:30 |
|
Yan
|
3a0e26b2ea
|
accounts and discount updated
|
2017-06-23 17:05:08 +06:30 |
|
Aung Myo
|
01e5b7ba6c
|
update authorize
|
2017-06-23 09:41:48 +06:30 |
|
Yan
|
7bf2499e83
|
add options in oqs
|
2017-06-22 17:32:13 +06:30 |
|
Aung Myo
|
25b6a893f2
|
first cancan
|
2017-06-22 15:33:55 +06:30 |
|
Aung Myo
|
d9d07a1cdc
|
update reprint
|
2017-06-21 18:19:44 +06:30 |
|
Aung Myo
|
6c4c817453
|
fixed fonflict
|
2017-06-21 10:22:43 +06:30 |
|
Nweni
|
a9e1d8c3d1
|
origami
|
2017-06-20 18:59:34 +06:30 |
|
Aung Myo
|
faae996d5d
|
Rebate balance in receipt
|
2017-06-20 11:31:02 +06:30 |
|
Phyo
|
aa4391af7d
|
Request bill from mobile
|
2017-06-15 14:07:43 +06:30 |
|
Yan
|
dd9863025f
|
prepare for payment bill
|
2017-06-14 18:15:01 +06:30 |
|
Yan
|
41e9aec389
|
add cashier in sale and origami ui updated
|
2017-06-14 16:51:25 +06:30 |
|
Yan
|
423776cadd
|
print format update
|
2017-06-12 18:19:30 +06:30 |
|
Yan
|
f834911587
|
to do req_bill_format and status changed after pay
|
2017-06-12 00:45:26 +06:30 |
|
Yan
|
43debf4b7e
|
merged with crm
|
2017-06-08 19:04:48 +06:30 |
|
Yan
|
907764b3e4
|
update discount
|
2017-06-08 18:02:40 +06:30 |
|
Aung Myo
|
ea4f50e779
|
update print
|
2017-06-08 16:52:50 +06:30 |
|
Aung Myo
|
44382d284f
|
fixed conflict
|
2017-06-07 22:29:43 +06:30 |
|
Yan
|
114c4ee14d
|
all changed for index in origami
|
2017-06-07 17:13:27 +06:30 |
|
Aung Myo
|
9ad04323f0
|
fixed conflict request_bill_con and origami index
|
2017-06-07 16:48:28 +06:30 |
|
Nweni
|
9a23716c23
|
others payment
|
2017-06-07 13:02:12 +06:30 |
|
Yan
|
fbf312f71c
|
change show to print method in req bills controller
|
2017-06-06 17:01:15 +06:30 |
|
Yan
|
c482318b1a
|
req bill bugs fixing
|
2017-06-06 16:37:42 +06:30 |
|
Aung Myo
|
e76296bb77
|
checkout crm
|
2017-06-06 14:44:25 +06:30 |
|
Yan
|
d28449a9c9
|
updated for bill print
|
2017-06-06 14:34:24 +06:30 |
|