Commit Graph

42 Commits

Author SHA1 Message Date
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
Nweni
b847cde62c sale query updated 2017-06-06 14:03:21 +06:30
Nweni
eaec6a39b4 fixed conflict 2017-06-06 09:47:33 +06:30
Aung Myo
b54a19cfff update query data for origami 2017-06-06 09:18:01 +06:30
Nweni
faca7295f7 added new image upload file 2017-06-05 17:14:07 +06:30
Aung Myo
af02a63263 fixed conflict request_bill and order model 2017-06-04 16:25:25 +06:30
Aung Myo
9b334a20fa fixed receipt bill print view 2017-06-04 16:13:15 +06:30
Cherry
e3f9d62bce Sale Save 2017-06-04 16:02:55 +06:30
Aung Myo
a2c9996b76 Finished Request Bill print function 2017-06-03 17:04:17 +06:30
Cherry
9afe39b7e2 commit for sales 2017-06-02 17:48:03 +06:30