Commit Graph

765 Commits

Author SHA1 Message Date
Yan
8d48a73cfc compatible test 2017-09-28 18:25:31 +06:30
Yan
3e4fc7d45d not compitable with our tech 2017-09-21 17:51:59 +06:30
Aung Myo
e878a6387e update member discount 2017-09-14 17:36:00 +06:30
Aung Myo
90681cddcc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-09-13 14:21:52 +06:30
Aung Myo
abde6745a4 update addorder modefined 2017-09-13 12:27:37 +06:30
Aung Myo
bbcce13a2e update addorder 2017-09-13 09:21:35 +06:30
Yan
4b732e8d8c menu edit fix 2017-09-12 17:23:42 +06:30
Yan
3d7295c081 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-09-07 15:37:12 +06:30
Yan
f67d4197ec add bill channel for req bill 2017-09-07 15:35:00 +06:30
Zin Lin Phyo
43cc308d89 stock check report 2017-09-07 10:30:20 +06:30
Yan
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Zin Lin Phyo
2e53b72574 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Timepicker Bug Fix
  Show data in Edit
  Promotion Destory Bug Fix
2017-09-06 18:28:09 +06:30
Zin Lin Phyo
5e1e0cd5b9 stock_check report template 2017-09-06 18:27:58 +06:30
Phyo
4ca3b708c4 Show data in Edit 2017-09-06 17:01:33 +06:30
Zin Lin Phyo
784e740da3 rename in_juty to in_duty 2017-09-06 11:18:02 +06:30
Zin Lin Phyo
31021813b0 inventory list and stock check 2017-09-05 16:47:50 +06:30
Yan
995ee8298e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant 2017-09-05 14:14:10 +06:30
Aung Myo
4a85039170 update oqs action cable for order cahnnel and oqs channel 2017-09-05 14:07:20 +06:30
Yan
d0a527d1ee code review and fix 2017-09-05 13:53:06 +06:30
Phyo
f56b7ab26e Promotion Destory Bug Fix 2017-09-05 10:44:33 +06:30
Yan
008da6ee47 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix 2017-09-04 14:58:30 +06:30
Zin Lin Phyo
6c94ba5457 in_juty ui update 2017-09-04 14:47:58 +06:30
Yan
82120e2ba1 updated commission for sale edit 2017-09-04 13:13:08 +06:30
Zin Lin Phyo
2330a1a33e calculate commission in sale_edit, void, foc 2017-09-04 12:09:04 +06:30
Zin Lin Phyo
98dae6d712 show and update changes in commission and report 2017-09-04 10:24:24 +06:30
Yan
e9e7aec028 update item edit 2017-09-01 16:03:55 +06:30
Yan
3726e8a7c3 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 18:09:35 +06:30
Zin Lin Phyo
0fbce1ca7c fix conflit 2017-08-31 18:07:05 +06:30
Yan
e09559c508 merge with august spring but merge fail 2017-08-31 15:58:01 +06:30
Nweni
12c8be597d Inventory Stock Check Print 2017-08-31 15:29:36 +06:30
Zin Lin Phyo
d1003e2f6a move load_commissioner to origamin/product_commission 2017-08-31 14:15:09 +06:30
Yan
f50ca87e59 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 19:16:20 +06:30
Yan
51d8c986f1 merge with august_spring 2017-08-30 19:16:07 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Phyo
2f0a7c11ad Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 18:22:42 +06:30
Phyo
bf9f0cdbe7 CRUD Update for Promotion 2017-08-30 18:22:22 +06:30
Zin Lin Phyo
5a0ca4b39d fix conflit 2017-08-30 15:58:06 +06:30
Zin Lin Phyo
675ebd56a7 assign in_juty in sale edit 2017-08-30 15:57:15 +06:30
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Yan
c7018ee774 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 11:14:11 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Zin Lin Phyo
4b97cd530e commission report export excel 2017-08-29 23:05:03 +06:30
Yan
76fb16615d merge with august sprint for commission 2017-08-29 18:44:31 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
Yan
7c5db11df5 merge with addorder 2017-08-29 18:08:05 +06:30
Aung Myo
2e48c1529e update addorder 2017-08-29 17:58:34 +06:30
Yan
bbd9a50868 merge with august spring 2017-08-28 18:33:49 +06:30
Yan
6472a2deac Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-28 18:27:58 +06:30
Aung Myo
1372285c7f update add order 2017-08-28 18:27:22 +06:30