Commit Graph

208 Commits

Author SHA1 Message Date
Nweni
5e3935f176 update shift 2017-06-30 13:10:28 +06:30
Nweni
8046bc7745 shift 2017-06-29 18:59:17 +06:30
Yan
50091e4016 updated for api bill controller 2017-06-28 16:56:43 +06:30
Nweni
986655052a shift 2017-06-28 15:29:44 +06:30
Yan
950fff469f update for req bill by cashier 2017-06-27 15:28:48 +06:30
Yan
464e72012b waiter and cashier in api/bill_controller 2017-06-27 15:26:02 +06:30
Aung Myo
376af85c64 update credit 2017-06-26 19:02:36 +06:30
Yan
e878275c1b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:10:25 +06:30
Nweni
d4983fabf5 item void 2017-06-26 17:07:17 +06:30
Yan
00c19fdd67 sub total fixed in origami shows 2017-06-26 14:16:22 +06:30
Yan
5d60d620b4 add for room tab and complete 2017-06-22 18:03:16 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Yan
e3b3ff76b2 add account_id to od_item and sale_item table 2017-06-21 14:49:01 +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
Aung Myo
675d83c80f sale item report and rebate balance 2017-06-19 11:54:34 +06:30
Yan
cf5854c2bb Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 11:06:39 +06:30
Aung Myo
6ffa73fa6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-18 20:18:12 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30
Aung Myo
7881ae4dfa daily sale report 2017-06-18 16:38:46 +06:30
Yan
5906dde741 uncomment for sale taxes 2017-06-18 13:18:53 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Yan
03feae5b0f fix get_order_items_details method in order_item and add taxes in receipt 2017-06-15 17:57:58 +06:30
Aung Myo
8cb40783a4 update requestby in sail 2017-06-15 10:20:26 +06:30
Nweni
34b1c26b0b update 2017-06-15 01:33:52 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +06:30
Yan
b4021a87c8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into pre_master 2017-06-14 10:16:55 +06:30
Yan
b7f1a0a029 print format updating 2017-06-14 10:15:35 +06:30
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +06:30
Aung Myo
7194f0e971 update sale search 2017-06-13 15:04:51 +06:30
Cherry
a247c142b8 ReceiptList Report Rough 2017-06-12 18:26:00 +06:30
Nweni
82de95ca22 update 2017-06-09 13:52:36 +06:30
Nweni
56ffd1f063 update sale order talble 2017-06-09 13:13:20 +06:30
Yan
9866acf198 editing discout 2017-06-08 15:21:53 +06:30
Yan
114c4ee14d all changed for index in origami 2017-06-07 17:13:27 +06:30
Yan
ed45c2dc1e merged for payment 2017-06-06 17:03:47 +06:30
Nweni
1c5c5e194c added sale order 2017-06-06 16:47:43 +06:30
Yan
c482318b1a req bill bugs fixing 2017-06-06 16:37:42 +06:30
Nweni
eaec6a39b4 fixed conflict 2017-06-06 09:47:33 +06:30
Nweni
0cc378f318 fixed conflict 2017-06-06 09:43:16 +06:30
Yan
b24e667e9e merged crm 2017-06-06 09:41:06 +06:30
Aung Myo
b54a19cfff update query data for origami 2017-06-06 09:18:01 +06:30
Yan
f1877408be fixed for pm key changed 2017-06-05 18:52:19 +06:30
Nweni
faca7295f7 added new image upload file 2017-06-05 17:14:07 +06:30
Aung Myo
e309b35669 fixed conflictsale item order order item 2017-06-04 16:51:38 +06:30
Min Zeya Phyo
4fc511d531 custom primary key for transaction 2017-06-04 16:27:14 +06:30
Cherry
e3f9d62bce Sale Save 2017-06-04 16:02:55 +06:30
Min Zeya Phyo
9dddd2fc78 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant 2017-06-03 15:05:25 +06:30