Commit Graph

3606 Commits

Author SHA1 Message Date
Aung Myo
c386fcfa03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-16 14:23:36 +06:30
Aung Myo
29434f2df9 update void paymal search 2018-05-16 14:20:20 +06:30
Aung Myo
95faa6fdb4 update edit controller for update qty without assigne items 2018-05-16 13:54:14 +06:30
Aung Myo
695461d2c5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 13:18:04 +06:30
Aung Myo
800ea01f23 bugs fixed 2018-05-16 13:17:52 +06:30
phyusin
33d5a0ad80 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-16 09:57:44 +06:30
phyusin
e679160e41 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 09:53:42 +06:30
phyusin
d6a3c949f0 comment remark for order reservation 2018-05-16 09:49:49 +06:30
Aung Myo
7c72d4b9a8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-16 09:23:33 +06:30
Aung Myo
c08c72d0cb update cash in and out for shift 2018-05-16 09:23:10 +06:30
phyusin
086ddd2ab5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-15 18:31:55 +06:30
phyusin
0a290d47d8 check customer back url 2018-05-15 18:30:13 +06:30
phyusin
a72ae34a46 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-15 17:36:05 +06:30
phyusin
de05c4423a check unclose shift in filter 2018-05-15 17:35:10 +06:30
Aung Myo
1eb6cd5bcf Merge branch 'adminbsb_material_ui' 2018-05-15 17:29:35 +06:30
Aung Myo
0680fa4090 update daily sale and receipt report 2018-05-15 17:28:47 +06:30
Aung Myo
e09fab1fed update migrate for checksum 2018-05-15 14:41:24 +06:30
Yan
9e6ac7811a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-15 13:19:52 +06:30
Yan
8acfe654eb update menu imp/exp 2018-05-15 13:19:27 +06:30
Yan
c7a33e5322 update menu imp/exp 2018-05-15 11:53:48 +06:30
Aung Myo
e2206508a7 open action controller 2018-05-15 11:27:49 +06:30
Aung Myo
dd5b0a76c5 Merge branch 'adminbsb_material_ui' 2018-05-15 11:26:51 +06:30
Aung Myo
835f4aded1 added product sale for sale item report 2018-05-15 11:25:10 +06:30
phyusin
eaa013c10f change status to doemal 2018-05-15 10:28:05 +06:30
phyusin
6b3c5e5fcf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-15 09:58:13 +06:30
phyusin
e6883fbf5f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 18:15:13 +06:30
phyusin
188976d2bf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 18:14:45 +06:30
phyusin
af9efb5fa0 hide popup modal in order reservation 2018-05-14 18:14:23 +06:30
Aung Myo
3d99082f2a update conflict payment detail 2018-05-14 17:37:48 +06:30
Aung Myo
08a7c700d7 Merge branch 'r-1804001-01' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-14 17:34:40 +06:30
Aung Myo
7d1498931c update payment detail 2018-05-14 17:30:15 +06:30
Aung Myo
32b81bf16f Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-14 17:27:52 +06:30
Aung Myo
763991ed93 update payment detail 2018-05-14 17:27:37 +06:30
phyusin
185ba2eaed Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-05-14 17:05:23 +06:30
phyusin
522ccae378 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 16:39:24 +06:30
phyusin
c86696c2c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 16:38:59 +06:30
phyusin
cef2249214 change modal close function 2018-05-14 16:38:40 +06:30
phyusin
25d3f335a0 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 16:01:09 +06:30
phyusin
6004b894ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 16:00:27 +06:30
phyusin
5101d7c103 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 15:59:03 +06:30
San Wai Lwin
11bae95ac6 Edit Jcb and master in ShiftSale 2018-05-14 15:58:02 +06:30
Aung Myo
25a138e27e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-05-14 15:54:32 +06:30
Aung Myo
d80a17d987 update payment detal for discount 2018-05-14 15:54:22 +06:30
phyusin
83a068f1a3 change waste to spoile in close cashier 2018-05-14 15:53:22 +06:30
phyusin
5ddfad7ef8 conflict data remove 2018-05-14 15:46:34 +06:30
phyusin
39dce3424e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-14 15:42:35 +06:30
phyusin
1c8ea30efa change popup ui 2018-05-14 15:42:11 +06:30
San Wai Lwin
8fda04372d Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန 2018-05-14 15:31:00 +06:30
Aung Myo
e264e7a32b update addorder js and css 2018-05-14 15:23:15 +06:30
Aung Myo
57c9cd4d6f updaate loading menu cache 2018-05-14 14:49:21 +06:30