Commit Graph

  • c4cefb05ae conflict data phyusin 2018-05-28 10:46:04 +06:30
  • 597bab756f Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-28 10:41:21 +06:30
  • a1c85b79f1 add parenthesis in discount phyusin 2018-05-28 10:41:05 +06:30
  • 7dba4d2b45 pull from master San Wai Lwin 2018-05-28 09:44:13 +06:30
  • 11f8ff1f4c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-25 17:59:25 +06:30
  • 19543d3a55 remove filter for payment type in receipt no phyusin 2018-05-25 17:59:16 +06:30
  • 7ddbd7d78a conflit modified changes EikhantMon 2018-05-25 17:44:36 +06:30
  • 3c8e3c5326 Add Order Set Pdf San Wai Lwin 2018-05-25 17:06:45 +06:30
  • 1ae55f1af2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering EikhantMon 2018-05-25 16:23:42 +06:30
  • 6c26dc4d5a item_slim_customise_pdf EikhantMon 2018-05-25 16:23:24 +06:30
  • 578c14ccc3 Pull from master San Wai Lwin 2018-05-25 16:22:30 +06:30
  • f906134fbf Remove lookup settings in Order Pdf San Wai Lwin 2018-05-25 16:06:10 +06:30
  • f6b951a472 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-25 15:27:19 +06:30
  • 5d63d38e4e add inclc in receipt bill phyusin 2018-05-25 15:25:39 +06:30
  • b3e0e7e453 check survey params phyusin 2018-05-25 15:01:15 +06:30
  • 590b67abdf show incl exec in receipt bill phyusin 2018-05-25 14:46:40 +06:30
  • 6562336e90 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-25 13:29:25 +06:30
  • 5feea91584 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-25 13:27:18 +06:30
  • 49453a22c0 change tax profile overide phyusin 2018-05-25 13:26:55 +06:30
  • 7f6b0e0bdf update order api Aung Myo 2018-05-25 13:16:41 +06:30
  • b7c6614537 upadte api order create process order Aung Myo 2018-05-25 13:14:57 +06:30
  • 29814f61f2 update addorder sort name Aung Myo 2018-05-24 18:13:10 +06:30
  • d910c4078b Add Order item & summary customise font pdf San Wai Lwin 2018-05-24 17:02:54 +06:30
  • 7649728c4d update menu json for sort by name Aung Myo 2018-05-24 16:29:51 +06:30
  • 36fe726fbe Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-24 15:37:28 +06:30
  • ab4dc671fb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-24 15:32:10 +06:30
  • a4390361be change puma name phyusin 2018-05-24 15:31:48 +06:30
  • 445f98cf7c payment tax UI phyusin 2018-05-24 15:30:44 +06:30
  • 22ebc74afc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-05-24 15:26:25 +06:30
  • 1c9674fa53 update processing itemjs Aung Myo 2018-05-24 15:26:12 +06:30
  • b56f2793bd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-24 14:59:59 +06:30
  • 76d7b1c6c0 change ui for xls phyusin 2018-05-24 14:58:09 +06:30
  • dbdeb07f18 Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-24 14:09:42 +06:30
  • 6d6d90050f update commission && report Aung Myo 2018-05-24 14:03:49 +06:30
  • 0970b0022e check shift open or not phyusin 2018-05-24 11:36:35 +06:30
  • b4d421fdcf check imsage path phyusin 2018-05-24 09:57:04 +06:30
  • fc9a1e521e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-23 18:13:39 +06:30
  • cf5c5bb4fa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-05-23 17:59:30 +06:30
  • 295615a9fc update addorder for qty toatal Aung Myo 2018-05-23 17:59:20 +06:30
  • 912f801de9 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-23 17:56:14 +06:30
  • 58c9ee669b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-23 17:55:44 +06:30
  • ed8f9978b6 remove paginate in surveys phyusin 2018-05-23 17:55:17 +06:30
  • 0ec4b6cb12 update addorder Aung Myo 2018-05-23 17:50:13 +06:30
  • 3a93830c94 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-23 17:41:35 +06:30
  • e23982c078 First Bill Click Alert San Wai Lwin 2018-05-23 17:31:11 +06:30
  • 9aa4bc0f2c Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-23 17:29:10 +06:30
  • 770ef87678 remove action cable comment phyusin 2018-05-23 17:28:41 +06:30
  • 777d83d35c Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-23 17:24:48 +06:30
  • 06ef27e2a3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-23 17:24:07 +06:30
  • 992914ee46 check multiple items in split bill phyusin 2018-05-23 17:23:38 +06:30
  • dd48bbfa46 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-23 17:02:03 +06:30
  • 917b4e0eed Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-23 17:00:34 +06:30
  • 85b997ddbe change receipt no report ui and add sale taxes for dining charges phyusin 2018-05-23 16:57:41 +06:30
  • 6236e06558 update commitssion Aung Myo 2018-05-23 16:33:20 +06:30
  • 512aad06bc Pull from master San Wai Lwin 2018-05-23 15:50:14 +06:30
  • 055ca1c95b update action controller Aung Myo 2018-05-23 15:38:35 +06:30
  • 71b6ade245 Edit Precision in Receipt Bill & Recceipt Bill A5 Pdf San Wai Lwin 2018-05-23 15:30:18 +06:30
  • ddeb2f2582 update production commission Aung Myo 2018-05-23 14:53:11 +06:30
  • 8134e37f5f Pull from master San Wai Lwin 2018-05-23 14:00:07 +06:30
  • 40bce7f598 Add Void button in Transaction/sales San Wai Lwin 2018-05-23 13:57:45 +06:30
  • 19c3b1f640 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2018-05-23 10:29:46 +06:30
  • 1b4d144b46 migerate employee Aung Myo 2018-05-23 10:29:32 +06:30
  • dbfc00435b pull from master 23.5.2018 San Wai Lwin 2018-05-23 09:36:49 +06:30
  • 95684aa942 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-22 19:20:55 +06:30
  • ec50fbdac2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-22 19:20:16 +06:30
  • 6ecab8074e change dashboard query phyusin 2018-05-22 19:19:46 +06:30
  • 9e56ece056 Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-22 16:55:02 +06:30
  • ec4a0a3f81 update employee active , addorder view Aung Myo 2018-05-22 16:54:18 +06:30
  • 70b7ec784f add base url for cloud mode phyusin 2018-05-22 14:15:31 +06:30
  • f1733d9f06 Pull from master San Wai Lwin 2018-05-22 13:26:23 +06:30
  • 574f320dfd Export excel in Survey Report San Wai Lwin 2018-05-22 11:37:08 +06:30
  • ead01f3d97 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant phyusin 2018-05-22 11:15:17 +06:30
  • aa3da073bd back btn for pending phyusin 2018-05-22 10:59:56 +06:30
  • 1b5f657d0c update commission Aung Myo 2018-05-22 10:53:06 +06:30
  • b68169b244 update promotion with tax Aung Myo 2018-05-21 17:26:48 +06:30
  • fcfeb6fd98 update js for precompile Aung Myo 2018-05-21 16:57:32 +06:30
  • 80e9f4fc36 update menu json for unscope4 Aung Myo 2018-05-21 15:59:42 +06:30
  • f5ad727c08 update menu cateogry and myanmar font in xls Aung Myo 2018-05-21 15:30:15 +06:30
  • 073e054666 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-05-21 14:18:09 +06:30
  • 99b987adea update receipt pdf for 0price Aung Myo 2018-05-21 14:17:15 +06:30
  • 38e89674e9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 Aung Myo 2018-05-21 13:05:09 +06:30
  • 5a9dae725e update conflict js Aung Myo 2018-05-21 13:04:00 +06:30
  • 7e8b69aa7c update action cable and other bugs Aung Myo 2018-05-21 13:00:55 +06:30
  • ea01290a19 remove back btn phyusin 2018-05-21 12:39:34 +06:30
  • cfc672dc31 Pull from master San Wai Lwin 2018-05-21 11:12:12 +06:30
  • 85625b7090 Edit in A5pdf San Wai Lwin 2018-05-21 11:08:08 +06:30
  • 98b043c170 Edit in receipt Bill San Wai Lwin 2018-05-21 10:11:12 +06:30
  • 75d7999f76 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 phyusin 2018-05-18 18:17:36 +06:30
  • dbfebde010 action controller phyusin 2018-05-18 18:16:54 +06:30
  • e0a1c6c0e7 order reservation phyusin 2018-05-18 18:15:42 +06:30
  • 5316f23ba7 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-18 18:02:40 +06:30
  • 4069f61bfc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2018-05-18 18:02:20 +06:30
  • e1bb01c029 change dashboard query and report phyusin 2018-05-18 18:01:44 +06:30
  • e722ab88e9 Merge branch 'adminbsb_material_ui' Aung Myo 2018-05-18 17:38:17 +06:30
  • d7992cd4b8 update access code for void foc and edit Aung Myo 2018-05-18 16:57:34 +06:30
  • c1525be826 Pull from master San Wai Lwin 2018-05-18 16:26:03 +06:30
  • 610d39847e Add Approved By for waste & Spolie in Receive San Wai Lwin 2018-05-18 16:23:14 +06:30
  • 5e4b727d52 remove console.log Yan 2018-05-18 16:00:45 +06:30
  • 0e4d321142 actioncable test Yan 2018-05-18 15:32:29 +06:30
  • 881593ce2c acable test Yan 2018-05-18 15:12:58 +06:30