git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 1fa2d090ab upgrading Yan 2017-10-31 18:46:18 +06:30
  • 4660530218 upgrade version Yan 2017-10-31 18:41:19 +06:30
  • f01fab0951 fix seed Yan 2017-10-31 18:23:03 +06:30
  • 01c4eeca81 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-10-31 18:05:29 +06:30
  • b89340b85e update payment menthod report Aung Myo 2017-10-31 18:03:36 +06:30
  • 4ce8a0afbb check for payment methods Yan 2017-10-31 15:57:50 +06:30
  • c8c32cd6b3 add logo Yan 2017-10-31 13:45:14 +06:30
  • 6a3e604af3 dev ip change Yan 2017-10-31 13:42:09 +06:30
  • cd11841df1 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-31 13:41:36 +06:30
  • 89381eb72b add manage in ability for supervisor Yan 2017-10-31 13:34:52 +06:30
  • 1239b308f9 update void alert Aung Myo 2017-10-31 13:34:01 +06:30
  • cfa819f985 fixed conflic Aung Myo 2017-10-31 12:13:19 +06:30
  • 56940d7f00 update sale audit Aung Myo 2017-10-31 12:08:27 +06:30
  • 08bccd6144 fix seed for new receipt no Yan 2017-10-31 11:03:00 +06:30
  • e3b536d58c check and update for origami btn show Yan 2017-10-31 10:50:13 +06:30
  • 041f9b9fe2 need to edit origami Yan 2017-10-31 10:38:19 +06:30
  • 1189761e49 comment order Yan 2017-10-31 10:08:26 +06:30
  • 985b3a5164 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-31 09:18:06 +06:30
  • c1db3ba8be merge with aung myo Yan 2017-10-30 18:52:48 +06:30
  • 72414b53b5 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-30 18:51:22 +06:30
  • 35161aae91 remove turbolink in backend and update logout Yan 2017-10-30 18:51:05 +06:30
  • da0558b5ef remove turbolinks in form for conflict Yan 2017-10-30 17:26:38 +06:30
  • 7beb4e7563 test for turbolink Yan 2017-10-30 14:33:05 +06:30
  • 8c67b87f47 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-30 14:23:24 +06:30
  • 9426834541 add localization text for all report phyusin 2017-10-30 14:23:00 +06:30
  • a687b45193 update adminbsbs Aung Myo 2017-10-30 12:14:11 +06:30
  • 4c6c503e15 add localization text for Transactions tab phyusin 2017-10-30 11:48:44 +06:30
  • 558ec84819 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-30 10:37:36 +06:30
  • 8169da4d52 edit product form Yan 2017-10-30 10:29:02 +06:30
  • 74e90c98d3 add localization text for inventory phyusin 2017-10-30 10:27:54 +06:30
  • 8d12acb530 test for select Yan 2017-10-30 10:09:22 +06:30
  • 0422855ddd Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-30 09:23:00 +06:30
  • ae5dfaf192 test for no work js,it cause by turbolink Yan 2017-10-29 14:20:24 +06:30
  • 5bdc8e25c8 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-28 13:27:30 +06:30
  • 772b65f2d8 merge with augn myo Yan 2017-10-27 18:41:44 +06:30
  • 6f6c037e9e merge with phyu sin Yan 2017-10-27 18:40:58 +06:30
  • 6feb524db8 test for checkbox fail Yan 2017-10-27 18:39:44 +06:30
  • 814623b303 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-27 18:16:01 +06:30
  • 5912b00d43 add localization text for other modules phyusin 2017-10-27 18:15:34 +06:30
  • 0a7da11aa1 new bsb version to old Yan 2017-10-27 17:44:06 +06:30
  • a1c812574a update control with cancancan in sidebar Aung Myo 2017-10-27 17:37:34 +06:30
  • e76b61987c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-27 17:17:37 +06:30
  • 5c27dcff66 merge with origin Yan 2017-10-27 17:06:07 +06:30
  • 0f24cc0999 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-27 17:02:17 +06:30
  • d40b781c23 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-27 17:01:51 +06:30
  • ef05aec1db add localization for all form data phyusin 2017-10-27 17:00:56 +06:30
  • 61c9fd0c81 test for js Yan 2017-10-27 16:53:32 +06:30
  • 79a46ba7cf update induties Aung Myo 2017-10-27 16:50:26 +06:30
  • d916c262d7 validation for commission, commissioner phyusin 2017-10-27 13:51:45 +06:30
  • 445d63e286 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-27 13:42:22 +06:30
  • 20c0c2ca98 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-27 13:28:49 +06:30
  • 19b9b5c557 add validation for payment method,print_setting,tax_profile phyusin 2017-10-27 13:28:25 +06:30
  • b4005efa1b fixed conflic Aung Myo 2017-10-27 13:25:13 +06:30
  • 188d091884 update checkout all formm Aung Myo 2017-10-27 13:17:32 +06:30
  • 0d2952c35f hourly sale group query phyusin 2017-10-27 12:04:42 +06:30
  • 6b3616f644 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-27 12:03:00 +06:30
  • 0653bfab53 check required for oqs and cashier terminal phyusin 2017-10-27 12:02:38 +06:30
  • c8ee056312 fix hourly chart Yan 2017-10-27 12:01:07 +06:30
  • 8de7dd7c0b update dining_charge Yan 2017-10-27 11:56:54 +06:30
  • 8f5d24a2e3 hourly sale group Yan 2017-10-27 11:42:08 +06:30
  • 62ce53c978 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-27 11:40:39 +06:30
  • 1765a5dd36 fix dashboard js error phyusin 2017-10-27 11:39:51 +06:30
  • 18aa3d1e0f ui updated Yan 2017-10-27 11:37:47 +06:30
  • a57b0760fb change right panel text for promotion phyusin 2017-10-27 11:13:36 +06:30
  • f49ba4b3d8 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-27 09:24:04 +06:30
  • 59d50856ad merge with ui_charges Yan 2017-10-26 18:16:07 +06:30
  • fc49372a8b Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-26 18:12:27 +06:30
  • 171c732c86 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-26 18:11:17 +06:30
  • 1dbb5d539b add icon and border for dashboard phyusin 2017-10-26 18:10:52 +06:30
  • 4607321726 merge with origin Yan 2017-10-26 17:58:43 +06:30
  • 0da1aeaeb9 ui review and edited Yan 2017-10-26 17:54:22 +06:30
  • 89d2bc7b39 update conflic from adminbsb_uidesign branch Aung Myo 2017-10-26 17:52:21 +06:30
  • 2e6478ebed update breadcrumb Aung Myo 2017-10-26 17:45:37 +06:30
  • 92ef1dcdae update material ui Aung Myo 2017-10-26 17:02:26 +06:30
  • 526649e6df update right panel text for menu phyusin 2017-10-26 17:01:03 +06:30
  • c98b5cbb6e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-26 16:20:35 +06:30
  • 51dbb321a2 add right panel text for settings and CRM/queue phyusin 2017-10-26 16:19:23 +06:30
  • 6b88403186 update notification Aung Myo 2017-10-26 14:06:42 +06:30
  • 15604fea2c update notification Aung Myo 2017-10-26 13:49:15 +06:30
  • 055dcbe4cb add right panel text for menu item attributes/options phyusin 2017-10-26 10:33:58 +06:30
  • 645d9b3f94 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-10-26 10:23:38 +06:30
  • 805ca6709f add right panel text for menu and order queue station phyusin 2017-10-26 10:23:15 +06:30
  • fe6d8a4be0 update item attr and options pages Aung Myo 2017-10-26 10:21:46 +06:30
  • 40bb227975 merge with amyo ui Yan 2017-10-25 18:31:20 +06:30
  • 9cc2c61700 fixed from trello bug Yan 2017-10-25 18:25:28 +06:30
  • 5b7177ec97 update fix conflic Aung Myo 2017-10-25 18:18:59 +06:30
  • d5141c30bb update promtion and dining charges Aung Myo 2017-10-25 18:13:44 +06:30
  • 1569e05b99 add right panel text for menu phyusin 2017-10-25 18:11:06 +06:30
  • 98334531b2 remove conflict text phyusin 2017-10-25 16:53:22 +06:30
  • 193ddc2486 add right panel text phyusin 2017-10-25 16:41:58 +06:30
  • fa5b544416 update site bar and credit note view in transaction Aung Myo 2017-10-25 15:06:28 +06:30
  • 2ae1b5ba3d fix seed Yan 2017-10-25 14:31:25 +06:30
  • c3f21445d8 update conflicx reset.css Aung Myo 2017-10-25 14:05:15 +06:30
  • da6d85eaf5 update report and inventory layout design Aung Myo 2017-10-25 14:03:15 +06:30
  • 32866428ce update promotion ui Yan 2017-10-25 13:57:07 +06:30
  • bbae5cd5cc update promotion form Yan 2017-10-25 13:03:12 +06:30
  • 82d48f8246 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Yan 2017-10-24 18:23:16 +06:30
  • 0eea755acd Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-10-24 18:16:38 +06:30
  • 34a4e485af update setting admin pages Aung Myo 2017-10-24 18:16:03 +06:30
  • fa554067a3 fix seed Yan 2017-10-24 17:57:03 +06:30