Commit Graph

366 Commits

Author SHA1 Message Date
Aung Myo
e3cf15c096 update admin bsb design 2017-10-16 11:41:53 +06:30
Yan
de1469bd5e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-12 10:16:00 +06:30
Yan
bc2101bf42 merge with staging 2017-10-12 09:59:24 +06:30
Yan
4ab89efaf2 add font for print setting 2017-10-11 15:16:40 +06:30
Yan
5ba3a69c3f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-10-11 10:03:30 +06:30
Aung Myo
50756656a7 updat e addorder for product add 2017-10-10 18:05:09 +06:30
Yan
8933dde41d add promotion activation in cashier req bill 2017-10-10 15:53:08 +06:30
Aung Myo
33f03b2e05 update adminbsb theme all theme setting 2017-10-10 14:11:38 +06:30
Aung Myo
79c7b46ab7 update adminbsb design 2017-10-09 18:17:45 +06:30
Aung Myo
444b270dd1 update ui design 2017-09-29 13:42:41 +06:30
Aung Myo
d4484ce849 update addorder 2017-09-27 15:29:08 +06:30
Aung Myo
ddf466d3fe update addorder available and max qty 2017-09-27 11:26:13 +06:30
Aung Myo
dd9e8fe908 update queue and completed sale 2017-09-21 17:54:57 +06:30
Aung Myo
e878a6387e update member discount 2017-09-14 17:36:00 +06:30
Aung Myo
abde6745a4 update addorder modefined 2017-09-13 12:27:37 +06:30
Yan
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Zin Lin Phyo
784e740da3 rename in_juty to in_duty 2017-09-06 11:18:02 +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
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
Zin Lin Phyo
675ebd56a7 assign in_juty in sale edit 2017-08-30 15:57:15 +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
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
Zin Lin Phyo
63d97cce26 fix conflit 2017-08-28 18:22:32 +06:30
yamin
0369cd6646 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 17:56:24 +06:30
yamin
81c928b375 InJutyUpdate 2017-08-28 17:55:47 +06:30
Zin Lin Phyo
4fd4fdaeb7 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Dining Charges Bug Fix
  InJutyIndexform
2017-08-28 09:47:06 +06:30
Zin Lin Phyo
3131823ae0 commission update -> change route under settings 2017-08-28 09:46:36 +06:30
Yan
812a32a89f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-25 18:57:06 +06:30
Aung Myo
2522950019 update create order function 2017-08-25 18:55:34 +06:30
yamin
61817ce178 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 18:49:02 +06:30
yamin
57d668d122 InJutyIndexform 2017-08-25 18:48:34 +06:30
Zin Lin Phyo
ef9fe32b5b fix conflit 2017-08-25 13:46:50 +06:30
Zin Lin Phyo
b4eb27b8a9 commission in sale edit 2017-08-25 13:44:22 +06:30
yamin
29a5062b85 InJutiesUpdate 2017-08-25 13:06:25 +06:30
Yan
836fa6cddb Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 18:33:21 +06:30
yamin
7004637027 In_juties 2017-08-24 18:24:57 +06:30
Yan
d1f5c94be8 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 15:28:56 +06:30
Yan
412bfea5b3 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 15:21:46 +06:30