Commit Graph

1756 Commits

Author SHA1 Message Date
San Wai Lwin
fc8b2d3b73 Pull from master 2018-04-05 11:49:42 +06:30
phyusin
907fd671c8 check foreigner lists 2018-04-04 11:55:45 +06:30
San Wai Lwin
650eb53f51 Pull from master 2018-04-02 18:10:47 +06:30
San Wai Lwin
c53276f21c Add survey's fieldset 2018-04-02 18:09:36 +06:30
Aung Myo
d1a62948e9 Merge branch 'adminbsb_material_ui' 2018-03-30 17:47:46 +06:30
Aung Myo
2dec217bcc update waste and spoile 2018-03-30 17:23:59 +06:30
phyusin
fc8d8eea4a add paymal payment 2018-03-30 16:53:38 +06:30
phyusin
ac5987fbb5 Merge branch 'topup_payment' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-30 16:38:00 +06:30
phyusin
298fc9a3f0 merge with second display 2018-03-30 15:48:55 +06:30
phyusin
8e14d93c4c merge with master 2018-03-30 15:36:41 +06:30
phyusin
df93563e6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-30 15:29:26 +06:30
phyusin
996392a041 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-30 15:25:15 +06:30
phyusin
6a9fd67bff check payment method 2018-03-30 15:24:51 +06:30
Aung Myo
37f3ef7a0d update customer assign redirect 2018-03-30 15:07:48 +06:30
Aung Myo
4faf1083d1 update waste and spoilage 2018-03-30 14:42:58 +06:30
Aung Myo
5588f40753 update waste and spoilage 2018-03-30 14:20:47 +06:30
phyusin
75f3377d75 change product sale report 2018-03-29 19:39:29 +06:30
San Wai Lwin
3ced0f2590 Pull from master 2018-03-29 18:17:10 +06:30
Aung Myo
d279c548a1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-29 16:16:33 +06:30
Aung Myo
386c5291a1 update waste and spoile 2018-03-29 16:16:19 +06:30
San Wai Lwin
c54441c391 Add UI view for Promotion Code 2018-03-29 15:07:46 +06:30
phyusin
1c13b04697 product sale checked 2018-03-29 10:47:29 +06:30
San Wai Lwin
2bf08827e7 Second Display Image finished 2018-03-29 10:03:21 +06:30
San Wai Lwin
ff19f20a18 Edit UI design for shop images 2018-03-28 14:52:57 +06:30
phyusin
e2c4fea589 check order edit error 2018-03-28 13:41:50 +06:30
Aung Myo
a7989191a6 Merge branch 'adminbsb_material_ui' 2018-03-28 11:16:39 +06:30
Aung Myo
204f622876 update sale item report 2018-03-28 11:10:37 +06:30
Aung Myo
f126d2faf6 update print file.substring for jade 2018-03-28 09:29:54 +06:30
phyusin
f21a75e73e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-26 16:42:32 +06:30
phyusin
4b78de3f9a add filter in dashboard and Transaction/Sale 2018-03-26 16:42:17 +06:30
Aung Myo
ac0ee37136 add foc , void and discount item in sale item report 2018-03-26 15:54:24 +06:30
San Wai Lwin
186353acb0 Multiple image upload finished 2018-03-26 11:40:04 +06:30
phyusin
6bb833aff3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-23 19:41:38 +06:30
phyusin
e0fe0ee8ab dashboard update 2018-03-23 18:06:53 +06:30
Aung Myo
65345d1add update scroll for menu 2018-03-23 14:51:14 +06:30
Aung Myo
bfe4271d65 Merge branch 'adminbsb_material_ui' 2018-03-23 13:55:57 +06:30
Aung Myo
dfb998f9e7 update paymemt multiple ui 2018-03-23 13:55:07 +06:30
phyusin
3e8c3f8225 check tax profile and member poup 2018-03-23 13:54:19 +06:30
Aung Myo
3066a0ca1a update payment select 2018-03-23 10:08:33 +06:30
phyusin
246f9afff5 sqa req: 2018-03-22 15:13:41 +06:30
phyusin
ebadfff25b add tax in charges 2018-03-22 11:09:12 +06:30
Aung Myo
b8a71079f4 update room show for jade print 2018-03-22 10:24:58 +06:30
Aung Myo
77face5d3a Merge branch 'adminbsb_material_ui' 2018-03-21 18:07:02 +06:30
Aung Myo
25c3a489a6 update first bill for jade print 2018-03-21 18:06:12 +06:30
phyusin
7063d937e3 latest Aston req from OPT team 2018-03-21 17:45:55 +06:30
Aung Myo
0390d15e0a Merge branch 'adminbsb_material_ui' 2018-03-21 17:09:06 +06:30
Aung Myo
28a2ae3852 update remove animated class for ui addorder 2018-03-21 17:04:49 +06:30
Aung Myo
80853fb666 update jade print in pay,void and foc 2018-03-21 15:37:45 +06:30
phyusin
16d60add22 add FOC,VOID remark in Transaction/Sale and new Transaction/Survey 2018-03-21 15:07:57 +06:30
Aung Myo
a30abfb30c Merge branch 'adminbsb_material_ui' 2018-03-21 13:10:59 +06:30