From 7eff82d87db656a239959d17891a51d216e2e9fc Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 4 Sep 2017 18:02:41 +0630
Subject: [PATCH 01/18] add public/image to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 42a48b40..f4897780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ capybara-*.html
 /db/*.sqlite3
 /db/schema.rb
 /db/structure.sql
+/public/image
 /public/system/*
 /public/assets/*
 /public/uploads/*

From 8966f290b5720908d57cdf1e5b0b827803e82145 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 18 Sep 2017 13:53:28 +0630
Subject: [PATCH 02/18] pull origin master

---
 .gitignore                                    |   2 +-
 .idea/workspace.xml                           | 849 ++++++++++--------
 app/assets/javascripts/OQS.js                 |  22 +-
 app/assets/javascripts/addorder.js            | 216 ++++-
 app/assets/javascripts/cable.js               |  10 +-
 app/assets/javascripts/channels/bill.js       |  14 +
 app/assets/javascripts/channels/order.js      |  14 +
 .../channels/order_queue_station.js           |  99 +-
 app/assets/stylesheets/OQS.scss               |   2 +
 app/assets/stylesheets/addorder.scss          |   4 +-
 .../stylesheets/inventory_definitions.scss    | 275 +++++-
 app/channels/application_cable/channel.rb     |   6 +-
 app/channels/application_cable/connection.rb  |   3 +
 app/channels/bill_channel.rb                  |  10 +
 app/channels/order_channel.rb                 |  10 +
 app/channels/order_queue_station_channel.rb   |   1 +
 app/controllers/api/bill_controller.rb        |   9 +
 .../menu_item_attributes_controller.rb        |   5 +-
 app/controllers/home_controller.rb            |   9 +-
 .../inventory_definitions_controller.rb       |   2 +-
 .../inventory/stock_checks_controller.rb      | 147 ++-
 app/controllers/oqs/home_controller.rb        |   1 +
 .../origami/addorders_controller.rb           |  13 +-
 .../origami/discounts_controller.rb           | 165 ++--
 .../origami/in_duties_controller.rb           | 170 ++++
 .../origami/in_juties_controller.rb           | 172 ----
 app/controllers/origami/jcb_controller.rb     |   3 +
 app/controllers/origami/master_controller.rb  |   3 +
 app/controllers/origami/mpu_controller.rb     |   8 +-
 .../origami/payments_controller.rb            |   2 +
 .../origami/product_commissions_controller.rb |   2 +-
 .../origami/sale_edit_controller.rb           |  20 +-
 app/controllers/origami/visa_controller.rb    |   3 +
 .../reports/stock_check_controller.rb         |  48 +
 .../menu_item_instances_controller.rb         |   6 +-
 .../settings/promotions_controller.rb         |  18 +
 .../settings/set_menu_items_controller.rb     |   6 +-
 .../settings/simple_menu_items_controller.rb  |   6 +-
 app/helpers/origami/in_duties_helper.rb       |   2 +
 app/helpers/origami/in_juties_helper.rb       |   2 -
 app/jobs/bill_broadcast_job.rb                |   7 +
 app/jobs/order_broadcast_job.rb               |   6 +-
 app/jobs/order_queue_processor_job.rb         |  16 +-
 app/models/assigned_order_item.rb             |  23 +
 app/models/dining_charge.rb                   |   4 +-
 app/models/{in_juty.rb => in_duty.rb}         |   2 +-
 app/models/menu_item_instance.rb              |  14 +-
 app/models/order.rb                           |   7 +-
 app/models/product_commission.rb              |  57 +-
 app/models/promotion.rb                       |  71 +-
 app/models/sale.rb                            |  24 +-
 app/models/sale_item.rb                       |  10 +
 app/models/sale_payment.rb                    |   2 +
 app/models/stock_check.rb                     |   9 +-
 app/models/stock_check_item.rb                |  12 +-
 app/pdf/stock_result_pdf.rb                   |  90 +-
 .../restaurant/menu/_menu_item.json.jbuilder  |   6 +-
 .../menu_item_attributes/show.json.jbuilder   |   8 +
 app/views/home/dashboard.html.erb             |  23 +-
 .../inventory/_inventory_list.html.erb        |  14 +-
 app/views/inventory/inventory/index.html.erb  |  31 +-
 .../inventory_definitions/_form.html.erb      |  89 +-
 .../inventory_definitions/edit.html.erb       |  16 +-
 .../inventory/stock_checks/index.html.erb     | 115 ++-
 .../inventory/stock_checks/show.html.erb      | 117 +--
 app/views/layouts/_header.html.erb            |   1 +
 app/views/layouts/_header_inventory.html.erb  |  38 +
 app/views/layouts/inventory.html.erb          |   4 +-
 app/views/oqs/_oqs_test.html.erb              |  51 ++
 app/views/oqs/home/index.html.erb             |  79 +-
 .../addorders/_menu_item.json.jbuilder        | 117 +++
 app/views/origami/addorders/detail.html.erb   |  51 +-
 .../addorders/get_menu_category.json.jbuilder |   5 +
 app/views/origami/discounts/index.html.erb    |   2 +-
 app/views/origami/home/index.html.erb         | 192 ++--
 app/views/origami/home/show.html.erb          |  26 +-
 .../_assign_in_duty.html.erb}                 |  11 -
 .../_edit_in_duty.html.erb}                   |   2 +-
 .../{in_juties => in_duties}/_form.html.erb   |  15 +-
 .../origami/in_duties/_in_duty.json.jbuilder  |   2 +
 .../assign_in_duty.html.erb}                  |  20 +-
 .../{in_juties => in_duties}/edit.html.erb    |   4 +-
 .../origami/in_duties/edit_in_duty.html.erb   |   6 +
 .../{in_juties => in_duties}/index.html.erb   |  46 +-
 .../origami/in_duties/index.json.jbuilder     |   1 +
 .../index_in_duty.html.erb}                   |  64 +-
 .../{in_juties => in_duties}/new.html.erb     |   4 +-
 .../{in_juties => in_duties}/show.html.erb    |  18 +-
 .../origami/in_duties/show.json.jbuilder      |   1 +
 .../origami/in_juties/_in_juty.json.jbuilder  |   2 -
 .../origami/in_juties/edit_in_juty.html.erb   |   6 -
 .../origami/in_juties/index.json.jbuilder     |   1 -
 .../origami/in_juties/show.json.jbuilder      |   1 -
 app/views/origami/jcb/index.html.erb          | 306 ++++---
 app/views/origami/master/index.html.erb       | 312 ++++---
 .../origami/movetable/move_dining.html.erb    |  31 +-
 app/views/origami/mpu/index.html.erb          | 319 ++++---
 app/views/origami/orders/show.html.erb        |   2 +-
 app/views/origami/payments/show.html.erb      | 608 +++++++------
 .../load_commissioners.html.erb               |   3 +-
 app/views/origami/rooms/show.html.erb         |  22 +-
 app/views/origami/visa/index.html.erb         | 312 ++++---
 app/views/reports/commission/index.html.erb   |  14 +-
 .../_stock_check_report_filter.html.erb       |  89 ++
 app/views/reports/stock_check/index.html.erb  |  87 ++
 app/views/reports/stock_check/index.xls.erb   |  52 ++
 app/views/settings/commissions/_form.html.erb |   2 +-
 .../settings/dining_charges/_form.html.erb    |   2 +-
 .../menu_item_instances/edit.html.erb         |  23 +-
 app/views/settings/promotions/_form.html.erb  |  92 +-
 config/cable.yml                              |  12 +-
 config/environments/development.rb            |   4 +-
 config/initializers/assets.rb                 |   4 +
 config/routes.rb                              |  28 +-
 .../20170403161857_create_sale_items.rb       |   1 +
 db/migrate/20170530072247_create_shops.rb     |   2 +-
 ....rb => 20170823081748_create_in_duties.rb} |   6 +-
 dump.rdb                                      | Bin 851 -> 908 bytes
 public/fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes
 .../fonts/glyphicons-halflings-regular.woff   | Bin 0 -> 23424 bytes
 ...r_spec.rb => in_duties_controller_spec.rb} |   4 +-
 .../{in_juty_spec.rb => in_duty_spec.rb}      |   2 +-
 122 files changed, 3964 insertions(+), 2277 deletions(-)
 create mode 100644 app/assets/javascripts/channels/bill.js
 create mode 100644 app/assets/javascripts/channels/order.js
 create mode 100644 app/channels/bill_channel.rb
 create mode 100644 app/channels/order_channel.rb
 create mode 100644 app/controllers/origami/in_duties_controller.rb
 delete mode 100644 app/controllers/origami/in_juties_controller.rb
 create mode 100644 app/controllers/reports/stock_check_controller.rb
 create mode 100644 app/helpers/origami/in_duties_helper.rb
 delete mode 100644 app/helpers/origami/in_juties_helper.rb
 create mode 100644 app/jobs/bill_broadcast_job.rb
 rename app/models/{in_juty.rb => in_duty.rb} (78%)
 create mode 100644 app/views/api/restaurant/menu_item_attributes/show.json.jbuilder
 create mode 100644 app/views/layouts/_header_inventory.html.erb
 create mode 100644 app/views/oqs/_oqs_test.html.erb
 create mode 100644 app/views/origami/addorders/_menu_item.json.jbuilder
 create mode 100644 app/views/origami/addorders/get_menu_category.json.jbuilder
 rename app/views/origami/{in_juties/_assign_in_juty.html.erb => in_duties/_assign_in_duty.html.erb} (92%)
 rename app/views/origami/{in_juties/_edit_in_juty.html.erb => in_duties/_edit_in_duty.html.erb} (87%)
 rename app/views/origami/{in_juties => in_duties}/_form.html.erb (93%)
 create mode 100644 app/views/origami/in_duties/_in_duty.json.jbuilder
 rename app/views/origami/{in_juties/assign_in_juty.html.erb => in_duties/assign_in_duty.html.erb} (76%)
 rename app/views/origami/{in_juties => in_duties}/edit.html.erb (61%)
 create mode 100644 app/views/origami/in_duties/edit_in_duty.html.erb
 rename app/views/origami/{in_juties => in_duties}/index.html.erb (54%)
 create mode 100644 app/views/origami/in_duties/index.json.jbuilder
 rename app/views/origami/{in_juties/index_in_juty.html.erb => in_duties/index_in_duty.html.erb} (50%)
 rename app/views/origami/{in_juties => in_duties}/new.html.erb (58%)
 rename app/views/origami/{in_juties => in_duties}/show.html.erb (59%)
 create mode 100644 app/views/origami/in_duties/show.json.jbuilder
 delete mode 100644 app/views/origami/in_juties/_in_juty.json.jbuilder
 delete mode 100644 app/views/origami/in_juties/edit_in_juty.html.erb
 delete mode 100644 app/views/origami/in_juties/index.json.jbuilder
 delete mode 100644 app/views/origami/in_juties/show.json.jbuilder
 create mode 100644 app/views/reports/stock_check/_stock_check_report_filter.html.erb
 create mode 100644 app/views/reports/stock_check/index.html.erb
 create mode 100644 app/views/reports/stock_check/index.xls.erb
 rename db/migrate/{20170823081747_create_in_juties.rb => 20170823081748_create_in_duties.rb} (54%)
 create mode 100644 public/fonts/glyphicons-halflings-regular.ttf
 create mode 100644 public/fonts/glyphicons-halflings-regular.woff
 rename spec/controllers/origami/{in_juties_controller_spec.rb => in_duties_controller_spec.rb} (97%)
 rename spec/models/{in_juty_spec.rb => in_duty_spec.rb} (68%)

diff --git a/.gitignore b/.gitignore
index b6d9a051..38026948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,7 @@ config/deploy/config/*
 /dump.rdb
 
 # Fonts
-public/fonts/*
+# public/fonts/*
 
 # Ruby-Mine IDE folder
 /.idea
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0840cec0..e5ebd9a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/reports/stock_check_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/reports/stock_check_controller.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/stock_check.rb" afterPath="$PROJECT_DIR$/app/models/stock_check.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/stock_check_item.rb" afterPath="$PROJECT_DIR$/app/models/stock_check_item.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/layouts/_header.html.erb" afterPath="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/reports/stock_check/index.html.erb" afterPath="$PROJECT_DIR$/app/views/reports/stock_check/index.html.erb" />
     </list>
     <ignored path="$PROJECT_DIR$/.bundle/" />
     <ignored path="$PROJECT_DIR$/components/" />
@@ -17,7 +22,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1504150298331" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
+    <SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1504756796706" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
     <SUITE FILE_PATH="coverage/sxrestaurant@db_migrate__sxrestaurant.coverage" NAME="db:migrate: sxrestaurant Coverage Results" MODIFIED="1503652404616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
     <SUITE FILE_PATH="coverage/sxrestaurant@Rails_console__sxrestaurant.coverage" NAME="Rails console: sxrestaurant Coverage Results" MODIFIED="1503651318886" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
   </component>
@@ -44,51 +49,93 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="load_commissioners.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/product_commissions/load_commissioners.html.erb">
+      <file leaf-file-name="stock_check_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/reports/stock_check_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="199">
-              <caret line="74" column="27" lean-forward="false" selection-start-line="74" selection-start-column="27" selection-end-line="74" selection-end-column="27" />
+            <state relative-caret-position="222">
+              <caret line="14" column="81" lean-forward="true" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
+      <file leaf-file-name="product_commission.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/product_commission.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="422">
+              <caret line="69" column="5" lean-forward="true" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="stock_check.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/stock_check.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="stock_check_item.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/stock_check_item.rb">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="247">
-              <caret line="267" column="32" lean-forward="true" selection-start-line="267" selection-start-column="32" selection-end-line="267" selection-end-column="32" />
+              <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="sale_edit_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb">
+      <file leaf-file-name="_header.html.erb" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="69">
-              <caret line="62" column="21" lean-forward="false" selection-start-line="62" selection-start-column="21" selection-end-line="62" selection-end-column="21" />
+            <state relative-caret-position="303">
+              <caret line="58" column="80" lean-forward="false" selection-start-line="58" selection-start-column="50" selection-end-line="58" selection-end-column="80" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="product_commissions_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb">
+      <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/stock_check/index.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="182">
-              <caret line="95" column="25" lean-forward="false" selection-start-line="95" selection-start-column="25" selection-end-line="95" selection-end-column="25" />
+            <state relative-caret-position="308">
+              <caret line="80" column="8" lean-forward="true" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="8" />
+              <folding>
+                <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#3;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="_stock_check_report_filter.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/stock_check/_stock_check_report_filter.html.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-570">
+              <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/routes.rb">
+      <file leaf-file-name="_inventory_list.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory/_inventory_list.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="183" column="9" lean-forward="false" selection-start-line="183" selection-start-column="9" selection-end-line="183" selection-end-column="9" />
+            <state relative-caret-position="235">
+              <caret line="31" column="21" lean-forward="true" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index.xls.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/stock_check/index.xls.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="342">
+              <caret line="19" column="29" lean-forward="false" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
               <folding />
             </state>
           </provider>
@@ -98,8 +145,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>table_invoice</find>
-      <find>sale_id</find>
       <find>oqs</find>
       <find>void</find>
       <find>red</find>
@@ -121,7 +166,22 @@
       <find>gem &quot;select2-rails&quot;</find>
       <find>custom_excel</find>
       <find>load</find>
+      <find>promotion_original_product</find>
+      <find>in_juti</find>
+      <find>Juty</find>
+      <find>Juti</find>
+      <find>juty</find>
+      <find>Juties</find>
+      <find>juties</find>
+      <find>product_qty</find>
+      <find>item_code</find>
     </findStrings>
+    <replaceStrings>
+      <replace>Duties</replace>
+      <replace>Duty</replace>
+      <replace>duty</replace>
+      <replace>duties</replace>
+    </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -129,57 +189,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb" />
-        <option value="$PROJECT_DIR$/app/models/menu_item.rb" />
-        <option value="$PROJECT_DIR$/app/models/sale_item.rb" />
-        <option value="$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.html.erb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170821093252_create_commissions.rb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170818090115_create_commissioners.rb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissioners/edit.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissions/edit.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissions/new.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissions/show.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissions/_form.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissioners/new.html.erb" />
-        <option value="$PROJECT_DIR$/app/models/commissioner.rb" />
-        <option value="$PROJECT_DIR$/app/assets/stylesheets/settings.scss" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissions/index.html.erb" />
-        <option value="$PROJECT_DIR$/app/models/sale.rb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" />
-        <option value="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" />
-        <option value="$PROJECT_DIR$/app/models/promotion.rb" />
-        <option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
-        <option value="$PROJECT_DIR$/app/models/commission.rb" />
-        <option value="$PROJECT_DIR$/app/models/product_commission.rb" />
-        <option value="$PROJECT_DIR$/app/views/reports/commission/index.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/reports/commission/index.xls.erb" />
-        <option value="$PROJECT_DIR$/Gemfile.lock" />
-        <option value="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
-        <option value="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
-        <option value="$PROJECT_DIR$/Gemfile" />
-        <option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
-        <option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
-        <option value="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/in_juties/new.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/in_juties/index.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb" />
-        <option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
         <option value="$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
-        <option value="$PROJECT_DIR$/config/routes.rb" />
         <option value="$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/settings/commissions/_form.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/reports/commission/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb" />
+        <option value="$PROJECT_DIR$/app/models/product_commission.rb" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/origami/product_commissions/load_commissioners.html.erb" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
+        <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
+        <option value="$PROJECT_DIR$/app/assets/stylesheets/inventory_definitions.scss" />
+        <option value="$PROJECT_DIR$/app/controllers/inventory/inventory_definitions_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/layouts/inventory.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/layouts/_header_inventory.html.erb" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/in_duties_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/index_in_duty.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/_edit_in_juty.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/_form.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/_in_juty.json.jbuilder" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/edit_in_duty.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/edit.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/assign_in_duty.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/index.json.jbuilder" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/new.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/show.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_duties/show.json.jbuilder" />
+        <option value="$PROJECT_DIR$/db/migrate/20170823081747_create_in_duties.rb" />
+        <option value="$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
+        <option value="$PROJECT_DIR$/app/controllers/inventory/stock_checks_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/inventory/inventory_definitions/_form.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/inventory/inventory_definitions/edit.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/inventory/inventory/_inventory_list.html.erb" />
+        <option value="$PROJECT_DIR$/app/models/menu_item_instance.rb" />
+        <option value="$PROJECT_DIR$/app/pdf/stock_result_pdf.rb" />
+        <option value="$PROJECT_DIR$/app/views/inventory/stock_checks/show.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/inventory/stock_checks/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/reports/stock_check/index.xls.erb" />
+        <option value="$PROJECT_DIR$/config/routes.rb" />
+        <option value="$PROJECT_DIR$/app/views/inventory/inventory/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/reports/stock_check/_stock_check_report_filter.html.erb" />
+        <option value="$PROJECT_DIR$/app/models/stock_check.rb" />
+        <option value="$PROJECT_DIR$/app/controllers/reports/stock_check_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/reports/stock_check/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/models/stock_check_item.rb" />
+        <option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
       </list>
     </option>
   </component>
@@ -206,8 +266,8 @@
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="1440" />
     <option name="y" value="22" />
-    <option name="width" value="1440" />
-    <option name="height" value="834" />
+    <option name="width" value="1920" />
+    <option name="height" value="1058" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
@@ -227,9 +287,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="RailsProjectView" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -253,14 +311,14 @@
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="origami" type="462c0819:PsiDirectoryNode" />
+              <item name="inventory" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="settings" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
@@ -273,38 +331,61 @@
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="origami" type="462c0819:PsiDirectoryNode" />
+              <item name="inventory" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="origami" type="462c0819:PsiDirectoryNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
+              <item name="inventory" type="462c0819:PsiDirectoryNode" />
+              <item name="inventory" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="origami" type="462c0819:PsiDirectoryNode" />
-              <item name="product_commissions" type="462c0819:PsiDirectoryNode" />
+              <item name="inventory" type="462c0819:PsiDirectoryNode" />
+              <item name="inventory_definitions" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="settings" type="462c0819:PsiDirectoryNode" />
+              <item name="inventory" type="462c0819:PsiDirectoryNode" />
+              <item name="stock_checks" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="settings" type="462c0819:PsiDirectoryNode" />
-              <item name="commissions" type="462c0819:PsiDirectoryNode" />
+              <item name="layouts" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
+              <item name="commission" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
+              <item name="stock_check" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
@@ -321,13 +402,15 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="add_unversioned_files" value="$PROJECT_DIR$/config/database.yml" />
-    <property name="SearchEverywhereHistoryKey" value="header&#9;FILE&#9;file:///Users/zinlinphyo/Documents/projectX/code2lab/ror/sxrestaurant/app/views/layouts/_header.html.erb" />
+    <property name="SearchEverywhereHistoryKey" value="assetsrb&#9;FILE&#9;file:///Users/zinlinphyo/Documents/projectX/code2lab/ror/sxrestaurant/config/initializers/assets.rb&#10;header&#9;FILE&#9;file:///Users/zinlinphyo/Documents/projectX/code2lab/ror/sxrestaurant/app/views/layouts/_header.html.erb" />
     <property name="Ruby.ViewRefParam.DefaultExtension" value="html.erb" />
     <property name="RakeTaksPopup.undocumentedIncluded" value="false" />
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
@@ -724,12 +807,16 @@
       <workItem from="1503457057830" duration="7166000" />
       <workItem from="1503472116907" duration="50209000" />
       <workItem from="1503843212665" duration="21267000" />
-      <workItem from="1503909487511" duration="65887000" />
+      <workItem from="1503909487511" duration="81238000" />
+      <workItem from="1504495781883" duration="124000" />
+      <workItem from="1504496113282" duration="59763000" />
+      <workItem from="1504697324451" duration="1686000" />
+      <workItem from="1504752860890" duration="3935000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="218505000" />
+    <option name="totallyTimeSpent" value="299364000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -743,23 +830,23 @@
   <component name="ToolWindowManager">
     <frame x="1440" y="22" width="1920" height="1058" extended-state="6" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20181043" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20127796" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917964" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3468328" sideWeight="0.5021299" order="10" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17412141" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3258786" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34890965" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3468328" sideWeight="0.4978701" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3759086" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39252338" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36033228" sideWeight="0.4978701" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3561786" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.403946" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32502595" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -807,20 +894,47 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="40" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="ruby-line">
+          <url>file://$PROJECT_DIR$/app/models/product_commission.rb</url>
+          <line>8</line>
+          <option name="timeStamp" value="49" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="59" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/index.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="311">
-          <caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="32" />
-          <folding />
+        <state relative-caret-position="522">
+          <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.rbenv/shims/bundle">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/index.json.jbuilder">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="43" lean-forward="false" selection-start-line="0" selection-start-column="43" selection-end-line="0" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/index_in_duty.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="5" column="9" lean-forward="true" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/show.json.jbuilder">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="18">
+          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170816042256_settings_products.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -828,296 +942,117 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="75" column="27" lean-forward="false" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="31" column="15" lean-forward="false" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="65">
-          <caret line="58" column="84" lean-forward="false" selection-start-line="58" selection-start-column="84" selection-end-line="58" selection-end-column="84" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/api/bill_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="881">
-          <caret line="82" column="16" lean-forward="true" selection-start-line="82" selection-start-column="16" selection-end-line="82" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/home/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/home/dashboard.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4744">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="57" column="19" lean-forward="false" selection-start-line="57" selection-start-column="19" selection-end-line="57" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activesupport-5.1.3/lib/active_support/core_ext/object/blank.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/commission.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="6" lean-forward="false" selection-start-line="0" selection-start-column="6" selection-end-line="0" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/commissioner.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="6" lean-forward="false" selection-start-line="0" selection-start-column="6" selection-end-line="0" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/base_report_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="38" column="39" lean-forward="false" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.xls.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding>
-            <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/product_commission.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="412">
-          <caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-          <folding>
-            <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#3;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Gemfile.lock">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="301" column="17" lean-forward="false" selection-start-line="301" selection-start-column="17" selection-end-line="301" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/reports/commission_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="12" column="26" lean-forward="false" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="49" column="21" lean-forward="false" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/promotion.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="91">
-          <caret line="17" column="45" lean-forward="true" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Gemfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12">
-          <caret line="93" column="10" lean-forward="false" selection-start-line="93" selection-start-column="10" selection-end-line="93" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/application.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="25" column="33" lean-forward="false" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-            <marker date="1504065881000" expanded="true" signature="2006:2033" ph="..." />
-            <marker date="1504065881000" expanded="true" signature="2829:2856" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/promotions/new.html.erb">
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170823081748_create_in_duties.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="234">
-          <caret line="13" column="33" lean-forward="true" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
+          <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/_assign_in_duty.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1395">
+        <state relative-caret-position="216">
+          <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1994">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/new.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/_edit_in_duty.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="55" lean-forward="false" selection-start-line="8" selection-start-column="55" selection-end-line="8" selection-end-column="55" />
-          <folding />
+        <state relative-caret-position="216">
+          <caret line="12" column="10" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
-          <caret line="56" column="21" lean-forward="false" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="21" />
-          <folding />
+        <state relative-caret-position="224">
+          <caret line="576" column="38" lean-forward="false" selection-start-line="576" selection-start-column="38" selection-end-line="576" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/in_duties_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="38" column="14" lean-forward="false" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
-          <folding>
-            <element signature="e#1270#1276#0#HTML" expanded="true" />
-            <element signature="e#1276#1282#0#HTML" expanded="true" />
-            <element signature="e#1370#1376#0#HTML" expanded="true" />
-            <element signature="e#1376#1382#0#HTML" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="15" column="54" lean-forward="false" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activesupport-5.1.3/lib/active_support/callbacks.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="131" column="0" lean-forward="false" selection-start-line="131" selection-start-column="0" selection-end-line="131" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="452">
-          <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-215">
-          <caret line="1" column="38" lean-forward="false" selection-start-line="1" selection-start-column="38" selection-end-line="1" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
-          <folding />
+        <state relative-caret-position="485">
+          <caret line="121" column="32" lean-forward="true" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="32" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="1" column="47" lean-forward="true" selection-start-line="1" selection-start-column="2" selection-end-line="1" selection-end-column="47" />
+        <state relative-caret-position="180">
+          <caret line="10" column="12" lean-forward="true" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170824110117_create_stock_journals.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="198">
+          <caret line="11" column="31" lean-forward="false" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/new.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_duties/new.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
-          <folding />
+        <state relative-caret-position="180">
+          <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/actionpack-5.1.3/lib/action_controller/metal.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="211">
+          <caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/rack-2.0.3/lib/rack/request.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/actionpack-5.1.3/lib/action_dispatch/request/session.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activerecord-5.1.3/lib/active_record/dynamic_matchers.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="211">
+          <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activerecord-5.1.3/lib/active_record/core.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="211">
+          <caret line="198" column="0" lean-forward="false" selection-start-line="198" selection-start-column="0" selection-end-line="198" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activerecord-5.1.3/lib/active_record/scoping/default.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="211">
+          <caret line="39" column="0" lean-forward="false" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activerecord-5.1.3/lib/active_record/scoping.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
         </state>
       </provider>
     </entry>
@@ -1125,110 +1060,228 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/inventory_definition.rb">
+    <entry file="file://$PROJECT_DIR$/app/controllers/base_inventory_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="6" lean-forward="false" selection-start-line="0" selection-start-column="6" selection-end-line="0" selection-end-column="6" />
-          <folding />
+        <state relative-caret-position="234">
+          <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="21" column="84" lean-forward="true" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="84" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/controllers/inventory/inventory_definitions_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="9" lean-forward="false" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
-          <folding />
+        <state relative-caret-position="-200">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/new.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="180">
+          <caret line="10" column="6" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/promotions/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="350">
+          <caret line="47" column="21" lean-forward="true" selection-start-line="41" selection-start-column="12" selection-end-line="47" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/edit.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="5" column="14" lean-forward="false" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/_form.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="383">
+          <caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/menu_item_instance.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="23" column="13" lean-forward="true" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/pdf/stock_result_pdf.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/inventory/stock_checks_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="15" column="5" lean-forward="true" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/inventory/stock_checks/show.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="301">
+          <caret line="51" column="25" lean-forward="true" selection-start-line="51" selection-start-column="25" selection-end-line="51" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/reports/void_sale_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/reports/commission_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
+          <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2988">
-          <caret line="166" column="35" lean-forward="false" selection-start-line="166" selection-start-column="35" selection-end-line="166" selection-end-column="35" />
+        <state relative-caret-position="126">
+          <caret line="7" column="24" lean-forward="false" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/config/routes.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="183" column="9" lean-forward="false" selection-start-line="183" selection-start-column="9" selection-end-line="183" selection-end-column="9" />
+        <state relative-caret-position="5958">
+          <caret line="331" column="52" lean-forward="false" selection-start-line="331" selection-start-column="52" selection-end-line="331" selection-end-column="52" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.xls.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1066">
-          <caret line="64" column="5" lean-forward="false" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
+        <state relative-caret-position="108">
+          <caret line="6" column="51" lean-forward="false" selection-start-line="6" selection-start-column="51" selection-end-line="6" selection-end-column="51" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory/index.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="95" column="25" lean-forward="false" selection-start-line="95" selection-start-column="25" selection-end-line="95" selection-end-column="25" />
+        <state relative-caret-position="344">
+          <caret line="23" column="55" lean-forward="false" selection-start-line="23" selection-start-column="55" selection-end-line="23" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/inventory/stock_checks/index.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="265" column="6" lean-forward="false" selection-start-line="265" selection-start-column="6" selection-end-line="265" selection-end-column="6" />
+        <state relative-caret-position="18">
+          <caret line="31" column="17" lean-forward="false" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/reports/stock_check/index.xls.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="62" column="21" lean-forward="false" selection-start-line="62" selection-start-column="21" selection-end-line="62" selection-end-column="21" />
+        <state relative-caret-position="342">
+          <caret line="19" column="29" lean-forward="false" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/product_commissions/load_commissioners.html.erb">
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/actionpack-5.1.3/lib/action_controller/metal/rescue.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="74" column="27" lean-forward="false" selection-start-line="74" selection-start-column="27" selection-end-line="74" selection-end-column="27" />
+        <state relative-caret-position="378">
+          <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory/_inventory_list.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="235">
+          <caret line="31" column="21" lean-forward="true" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/product_commission.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="422">
+          <caret line="69" column="5" lean-forward="true" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/stock_check/_stock_check_report_filter.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-570">
+          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/reports/stock_check_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="222">
+          <caret line="14" column="81" lean-forward="true" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/stock_check/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="80" column="8" lean-forward="true" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="8" />
+          <folding>
+            <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#3;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/stock_check.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/stock_check_item.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="247">
-          <caret line="267" column="32" lean-forward="true" selection-start-line="267" selection-start-column="32" selection-end-line="267" selection-end-column="32" />
+          <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="303">
+          <caret line="58" column="80" lean-forward="false" selection-start-line="58" selection-start-column="50" selection-end-line="58" selection-end-column="80" />
           <folding />
         </state>
       </provider>
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 5ed26997..64ebc678 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -18,23 +18,23 @@
 //= require cable
 
 $(document).ready(function(){
-	
-	// auto refresh every 10 seconds
-	// setTimeout(function(){
-	//    window.location.reload(1);
-	// }, 10000);
+
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
     });
 
     $(".oqs_click").on("click", function(){
-       $("#completed").addClass('hide')
-       $(".oqs_append").removeClass('hide')
-       
+       $(".oqs_click").removeClass('oqs_active');
+       $(".queue_station").removeClass('queue_station_box');
+       $("#completed").addClass('hide');
+       $(".oqs_append").removeClass('hide');
+       $(this).addClass('oqs_active');
+       $(".queue_station").addClass('queue_station_box');
        var oqs_id = $(this).find(".oqs-id").text();
        var url    = 'oqs/get_items/'+oqs_id;
-       show_details(url); 
+      
+       show_details(url);
 
     }); //End Click
  
@@ -52,7 +52,7 @@ $(document).ready(function(){
 	        for(var field in data) {
 	          var price = parseFloat(data[field].price).toFixed(2);
 
-	          if (data[field]["options"] == "[]") {
+	          if (data[field]["options"] == "[]" || data[field]["options"] == "") {
 	           var options = "";
 	          }else{
 	           var options = data.options;
@@ -61,7 +61,7 @@ $(document).ready(function(){
 	          var date = new Date(data[field]["created_at"]); 
           var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 	           
-	          row ='<div class="card queue_station">'
+	          row ='<div class="card queue_station" data-date="'+data[field]["order_id"]+'">'
 	                  +'<div class="card-block">'
 	                      +'<h4 class="card-title">'
 	                        +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 095ae4e0..6d79ca2a 100644
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -8,18 +8,6 @@ $(function(){
   }); 
   //End menu category Click
 
-  $(".change_qty").change(function(){
-    qty = $(this).val();
-    price = $("#unit_price").text();
-    $("#total_price").text(qty*price);
-  });
-
-  $("#set_change_qty").change(function(){
-    qty = $(this).val();
-    price = $("#set_total_price").text();
-    $("#set_total_price").text(qty*price);
-  }); 
-
   //show menu item list when click menu category
   function show_menu_item_list(url_item){ 
     var menu_list = $('.menu_items_list');
@@ -34,7 +22,6 @@ $(function(){
         var menu_items_list = $('.menu_items_list');
         menu_items_list.empty();
         menu_items = data.menu_items;
-
         for(var field in menu_items) {  
           if (menu_items[field].is_sub_item == false) {
             instances = menu_items[field].instances ;
@@ -64,6 +51,12 @@ $(function(){
               data_target = 'sx_item_detailModal'
             }
 
+            if (menu_items[field].image) {
+              image_path = menu_items[field].image;
+            }else{
+              image_path = "/image/logo.png";
+            }
+
             row = '<div class="card custom-card">'
             +'<div class="custom-card-head card-head" style="line-height:14px;">'
             +'<small class="col-md-9">'+ menu_items[field].name +'</small>'
@@ -73,7 +66,7 @@ $(function(){
               + price +"' data-instance-code = '"+ code +"' data-instance = '"
               + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
               + JSON.stringify(item_attributes) +"' data-options = '"
-              + options +"'>"
+              + options +"' data-image='"+image_path+"'>"
             +"<i class='fa "+fa_plus+" '"
             + 'style="margin-top:4px;">'
             +'</i></div>'
@@ -88,7 +81,7 @@ $(function(){
               +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"'>"
 
             +"<div class='card-block custom-card-block'>"
-            +"<img id='logo' src='/image/logo.png'>"
+            +"<img id='logo' src='"+image_path+"'>"
 
             +"</div>"
 
@@ -105,10 +98,10 @@ $(function(){
   }
   //end show list function
   //click item row for item set
-   $(document).on('click', '.set_item_box', function(event){ 
-     $(".instance-list").empty();
-     $(".options-list").empty();
-    
+  $(document).on('click', '.set_item_box', function(event){ 
+    $(".instance-list").empty();
+    $(".options-list").empty();
+    change_qty_plus_minus("set_count","set_plus","set_minus");
     data =  $(this).parent().children().children('.add_icon');
 
     instances          = $(this).data('instance');
@@ -153,8 +146,10 @@ $(function(){
     $('#set_item_instances').text(instances);
     $('#set_name').text(data.attr('data-name'));
     $('#set_item_code').text(data.attr('data-item-code'));
-    $('#set_total_price').text(data.attr('data-price'));
+    // $('#set_total_price').text(data.attr('data-price'));
+    $('#set_total_price').text(0);
     $('#set_unit_price').text(data.attr('data-price'));
+    // $('#set_unit_price').text(0);
   });
   // click instance for add item set 
   $(document).on('click', '.instance_box', function(event){ 
@@ -180,7 +175,8 @@ $(function(){
       sub_total       = $('#set_total_price').text();
       name            = $(this).data('name');
       price           = $(this).data('price');
-      qty             = $('#set_change_qty').val();
+      // qty             = $('#set_change_qty').val();
+      qty             = document.getElementById("set_count").value;
       total           = qty*price;
       var total_price = +sub_total - +total;
       $(this).removeClass('selected-instance');
@@ -188,21 +184,24 @@ $(function(){
       $(this).removeAttr('data-options');
       $('#instance_option').text('')
     }else {
+
       sub_total       = $('#set_total_price').text();
       name            = $(this).data('name');
       price           = $(this).data('price');
-      qty             = $('#set_change_qty').val();
+      // qty             = $('#set_change_qty').val();
+      qty             = document.getElementById("set_count").value;
       total           = qty*price;
       var total_price = +sub_total + +total;
       $(this).addClass('selected-instance');
     }
+    $('#set_unit_price').text(price);
     $('#set_total_price').text(total_price);
   }); //End selecct attribute buttom
 
   // click add order 
   $(document).on('click', '.set_order', function(event){ 
     total_price   = $('#set_total_price').text();
-    qty           = parseInt($('#set_change_qty').val());
+    qty           = parseInt($('#set_count').val());
     item_code     = $('#set_item_code').text();
     item_name     = $('#set_name').text();
 
@@ -242,6 +241,7 @@ $(function(){
   $(document).on('click', '.menu_item_box', function(event){ 
     $('.attributes-list').empty();
     $('.options-list').empty();
+    $('#modal_box_img').empty();
     $('.attr-alert').addClass('hide');
     $('.add_to_order').removeAttr('data-instance-code');
     $('.add_to_order').removeAttr('data-instance');
@@ -253,30 +253,66 @@ $(function(){
     $('.add_to_order').removeAttr('data-attributes');
     $('.add_to_order').removeAttr('data-options');
 
+    change_qty_plus_minus("count","plus","minus");
+
     data =  $(this).parent().children().children('.add_icon');
+
+    $('#total_price').text(data.attr('data-price'));
     attributes         = $(this).data('id');
     selected_item      = $(this).data('item');
     instances          = $(this).data('instance');
     item_options       = $(this).data('option');
 
+    if (data.attr('data-image')) {
+      image = "<img id='' src='"+data.attr('data-image')+"'>";
+    }else{
+       image = "<img id='' src='/image/logo.png'>";
+    }
+    
+    $('#modal_box_img').append(image);
+
     instance_attributes = []
     for(var field in instances) { 
       value = instances[field].values;
       $(value).each(function(i){
-        options = value[i];
-        instance_attributes.push(options);
+         options = value[i];
+         instance_attributes.push(options);
+        // $.ajax({
+        //   type: "GET",
+        //   url: '../../api/restaurant/menu_item_attributes/'+value[i],
+        //   data: {id:value[i]},
+        //   success:function(result){
+
+        //     options = result["name"]; 
+        //     instance_attributes.push(options);
+        //   }
+        // });
       });
     }
 
+    // selected_arr = []
+    // $(selected_item).each(function(i){
+    //   $.ajax({
+    //     type: "GET",
+    //     url: '../../api/restaurant/menu_item_attributes/'+selected_item[i],
+    //     data: {id:selected_item[i]},
+    //     success:function(result){
+    //       name = result["name"]; 
+    //       selected_arr.push(name);
+    //     }
+    //   });
+    // });
+
+
     for(var field in attributes) { 
       value = attributes[field]["values"];
       type  = attributes[field]["type"]
-      row = "<h4>"+attributes[field]["type"]+"</h4>"
+      row = "<h4>"+attributes[field]["type"]+"</h4>";
+
       $(value).each(function(i){
         disabled = ""
         status ="";
-        
-        if(parseInt(jQuery.inArray(value[i], selected_item))!== -1){
+        if(parseInt(jQuery.inArray(value[i], selected_item)) !== -1){
           status = "selected-attribute";
         }
         if(parseInt(jQuery.inArray(value[i], instance_attributes)) == -1){
@@ -302,16 +338,21 @@ $(function(){
       $(".options-list").append(row); 
     }
 
-    $('#change_qty').val(1);
+    $('#count').val(1);
     $('#item_instances').text(instances);
     $('#title_name').text(data.attr('data-name'));
     $('#item_code').text(data.attr('data-item-code'));
+    $('#instance_name').text(data.attr('data-instance'));
+    $('#instance_code').text(data.attr('data-instance-code'));
+    $('#promotion_price').text(data.attr('data-promotion-price'));
     $('#total_price').text(data.attr('data-price'));
     $('#unit_price').text(data.attr('data-price'));
   });
 
   // click select option icon for add 
   $(document).on('click', '.attribute_btn', function(event){ 
+
+    $('.change_qty').val(1);
     value      = $(this).data('value');
     type       = $(this).data('type');
     instances  = $(this).data('instances');
@@ -331,7 +372,7 @@ $(function(){
     
     var selected_attr = get_selected_attributes('selected-attribute');
 
-    qty = $('#change_qty').val();
+    qty = $('.change_qty').val();
 
     for(var field in instances) { 
       item_attr = instances[field].values;
@@ -381,23 +422,30 @@ $(function(){
   // click add order 
   $(document).on('click', '.add_to_order', function(event){ 
     total_price   = $('#total_price').text();
-    qty           = parseInt($('#change_qty').val());
+    qty           = parseInt($('#count').val());
 
     var item_row  = $('.selected-attribute');
-    var instances = jQuery.parseJSON(item_row.attr('data-instances'));
-    
+
     attribute_arr = get_selected_attributes('selected-attribute');
     option_arr    = get_selected_attributes('selected-option');
 
-    for(var field in instances) {           
-      if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values)) {
-
-        $('.add_to_order').attr('data-instance-code',instances[field].code);
-        $('.add_to_order').attr('data-instance',instances[field].name);
-        $('.add_to_order').attr('data-price',instances[field].price);
-        $('.add_to_order').attr('data-promotion-price',instances[field].promotion_price);
+    if (item_row.length>0) {
+      var instances = jQuery.parseJSON(item_row.attr('data-instances'));
+      for(var field in instances) {           
+        if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values)) {
+          $('.add_to_order').attr('data-instance-code',instances[field].code);
+          $('.add_to_order').attr('data-instance',instances[field].name);
+          $('.add_to_order').attr('data-price',instances[field].price);
+          $('.add_to_order').attr('data-promotion-price',instances[field].promotion_price);
+        }
       }
+    }else{
+      $('.add_to_order').attr('data-instance-code',$('#instance_code').text());
+      $('.add_to_order').attr('data-instance',$('#instance_name').text());
+      $('.add_to_order').attr('data-price',$('#unit_price').text());
+      $('.add_to_order').attr('data-promotion-price',$('#promotion_price').text());
     }
+
     $('.add_to_order').attr('data-item-code',$('#item_code').text());
     $('.add_to_order').attr('data-qty',qty);
     $('.add_to_order').attr('data-name',$('#title_name').text());
@@ -417,7 +465,7 @@ $(function(){
   }); //End Add Icon Click
 
   function show_item_detail(data){
-    console.log(data)
+    
     qty           = parseInt(data.attr('data-qty'));
     append        = 0;
     price         = parseFloat(data.attr('data-price')).toFixed(2);
@@ -599,7 +647,7 @@ $(function(){
     var item_row    = $('.summary-items tbody tr');
     $(item_row).each(function(i){
       var order_item = {};
-      console.log($(item_row[i]).attr('data-options'));
+      
       order_item.order_item_id      = $(item_row[i]).attr('data-row');
       order_item.item_instance_code = $(item_row[i]).attr('data-instance-code');
       order_item.quantity           = $(item_row[i]).children('#item_qty').text();
@@ -620,4 +668,88 @@ $(function(){
     return attribute_arr;
   }
 
+  //click menu sidebar menu category
+  $("#back").on("click", function(){
+    var table_id   = $('#table_id').text();
+    var table_type = $('#table_type').text();
+    if(table_type == "Table"){
+      window.location.href = "/origami/table/" + table_id
+    }else {
+      window.location.href = "/origami/room/" + table_id
+   } 
+  }); 
+
+  // Get Selected Class
+  function change_qty_plus_minus(id,plus,minus) {
+
+    var count   = 1;
+    var countEl = document.getElementById(id);
+
+    $('#'+plus).on("click", function(){
+      
+      count++;
+      countEl.value = count;
+
+
+      if (id == "count") {
+        price = $("#unit_price").text();
+        $("#total_price").text(count*price);
+      }else{
+        var item_row      = $('.selected-instance');
+        price             = $("#set_unit_price").text();
+        set_total_price   = $("#set_total_price").text();
+
+        if (item_row.length > 1) {
+          total = 0 ;
+          $(item_row).each(function(i){
+            total += count * $(item_row[i]).attr('data-price');
+            total_price = total;
+          });
+        }else{
+          total_price     = count*price;
+        }
+        
+        $("#set_total_price").text(total_price);
+      }
+    });
+
+    $('#'+minus).on("click", function(){
+      if (count > 1) {
+        count--;
+        countEl.value = count;
+
+        if (id=="count") {
+          price = $("#unit_price").text();
+          $("#total_price").text(count*price);
+        }else{
+          var item_row      = $('.selected-instance');
+          price             = $("#set_unit_price").text();
+          set_total_price   = $("#set_total_price").text();
+
+          if (item_row.length > 1) {
+            total = 0 ;
+            $(item_row).each(function(i){
+              total += count * $(item_row[i]).attr('data-price');
+              total_price = total;
+            });
+          }else{
+            total_price     = count*price;
+          }
+          $("#set_total_price").text(total_price);
+        }
+      }  
+    })
+  }
+  // $("#set_change_qty").change(function(){
+  //   qty = $(this).val();
+  //   price = $("#set_total_price").text();
+  //   $("#set_total_price").text(qty*price);
+  // }); 
+
+ // $(".change_qty").change(function(){
+  //   qty = $(this).val();
+  //   price = $("#unit_price").text();
+  //   $("#total_price").text(qty*price);
+  // });
+
 });
\ No newline at end of file
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
index ce5ac871..55bfd46b 100644
--- a/app/assets/javascripts/cable.js
+++ b/app/assets/javascripts/cable.js
@@ -1,14 +1,14 @@
 // Action Cable provides the framework to deal with WebSockets in Rails.
 // You can generate new channels where WebSocket features live using the `rails generate channel` command.
-//
+
 //= require action_cable
 //= require_self
 //= require_tree ./channels
 
 // Temp Disable
-// (function() {
-//   this.App || (this.App = {});
+(function() {
+  this.App || (this.App = {});
 
-//   App.cable = ActionCable.createConsumer();
+  App.cable = ActionCable.createConsumer();
 
-// }).call(this);
+}).call(this);
diff --git a/app/assets/javascripts/channels/bill.js b/app/assets/javascripts/channels/bill.js
new file mode 100644
index 00000000..ab8e0898
--- /dev/null
+++ b/app/assets/javascripts/channels/bill.js
@@ -0,0 +1,14 @@
+App.order = App.cable.subscriptions.create('BillChannel', {
+//	App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {                 
+     $('.table_'+data.table.id).removeClass('blue');
+     $('.table_'+data.table.id).addClass('red');
+     $('.new_text_'+data.table.id).removeClass('hide')
+ }
+});
+
diff --git a/app/assets/javascripts/channels/order.js b/app/assets/javascripts/channels/order.js
new file mode 100644
index 00000000..dccb86d7
--- /dev/null
+++ b/app/assets/javascripts/channels/order.js
@@ -0,0 +1,14 @@
+App.order = App.cable.subscriptions.create('OrderChannel', {
+//	App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {                 
+     $('.table_'+data.table.id).removeClass('green');
+     $('.table_'+data.table.id).addClass('blue');
+     $('.new_text_'+data.table.id).removeClass('hide')
+ }
+});
+
diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js
index 85706bb5..1b9351cf 100644
--- a/app/assets/javascripts/channels/order_queue_station.js
+++ b/app/assets/javascripts/channels/order_queue_station.js
@@ -1,24 +1,83 @@
-// App.order_queue_station = App.cable.subscriptions.create("OrderQueueStationChannel", {
-//   connected: function() {},
+App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChannel', {
+//	App.messages = App.cable.subscriptions.create('MessagesChannel', {  
 
-//   disconnected: function() {},
+  connected: function() {},
 
-//   received: function(message) {                 
-//     alert(message);
-//   },
+  disconnected: function() {},
 
-//   order: function(message) {    
-//     return this.perform('order', {
-//       message: message
-//     });
-//   }
-// });
+  received: function(data) {                 
+  	// console.log(data.order);
+  	var oqs_id = $('.oqs_active').attr('data-id');
+  	items = data.order;
+  	for(var field in items) {
+  		var price = parseFloat(items[field].price).toFixed(2);
+  		if (items[field]["options"] == "[]" || items[field]["options"] == "") {
+  			var options = "";
+  		}else{
+  			var options = items.options;
+  		}
+  		//for count
+  		test = document.getElementsByClassName("oqs_count");
+
+        for (var i = 0; i < test.length; i++) {
+        	oqs_count_id = $(".oqs_count"+i).attr("data-id");
+        	oqs_count = $(".oqs_count"+i).text();
+       	    if ( oqs_count_id ==  items[field]["order_queue_station_id"]) {
+       	    	oqs_count_total = +oqs_count +1 ;
+       	    	$(".oqs_count"+i).text(oqs_count_total)
+       	    }
+        }
+        //end count
+
+  		var date = new Date(items[field]["created_at"]); 
+  		var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+
+  		if (oqs_id == items[field]["order_queue_station_id"]) {
+
+  			row ='<div class="card queue_station queue_station_box" data-date="'+items[field]["order_id"]+'">'
+          +'<strong class="hidden">'+items[field]["order_id"]+'</strong>'
+		  		+'<div class="card-block">'
+		  		+'<h4 class="card-title">'
+		  		+'<span class="order-zone-type">'+items[field]["table_type"]+'- </span>'
+		  		+'<span class="order-zone">'+ items[field]["zone"] +'</span>'
+		  		+'<small class="pull-right">'+ items[field]["order_id"] +'- </small>'
+		  		+'</h4>'
+
+		  		+'<h4>'
+		  		+'<span class="order-item">'+ items[field]["item_name"] +'- </span>'
+		  		+'<span class="order-qty">'+ items[field]["qty"] +'- </span>'
+		  		+'</h4>'
+
+		  		+'<p class="card-text item-options">'+ options +'</p>'
+
+		  		+'<p class="card-text">'
+		  		+'<small class="text-muted">Order at'
+		  		+'<span class="order-at">'+ show_date +'</span> - '
+
+		  		+'<span class="order-by">'+ items[field]["item_order_by"] +'</span> '
+		  		+'</small> '
+		  		+'</p>'
+
+		  		+'<p class="hidden order-customer">'+ items[field]["customer_name"] +'</p> '
+		  		+'<p class="hidden assigned-order-item">'+ items[field]["assigned_order_item_id"] +'</p> '
+		  		+'</div>'
+
+		  		+'<div class="card-footer">'
+		  		+'<button id="edit_'+ items[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+		  		+' <button id="assigned_queue_' + items[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+		  		+'</div>'
+			    +'</div>'; 
+  		  $('.oqs_append').append(row);
+  		}
+  	}//end looping
+
+    var $divs = $("div.queue_station");
+    var SortListDivs = $divs.sort(function (a, b) {
+      first = $(a).attr('data-date');
+      next  = $(b).attr('data-date');
+      return parseInt(next.substring(4, 16)) - parseInt(first.substring(4, 16));
+    });
+    $("#oqs_container").html(SortListDivs);
+ },
+});
 
-// $(function(){
-// 	$("#submit_order").on('click', function(event) {     
-// 		  var orderData=$("#new_order").serializeObject();      		    
-// 	    App.order_station.order(orderData);      
-// 	    //orderData='';
-// 	    return event.preventDefault();  
-// 	});
-// });
diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss
index 74a8032f..108c7541 100644
--- a/app/assets/stylesheets/OQS.scss
+++ b/app/assets/stylesheets/OQS.scss
@@ -25,3 +25,5 @@
 	font-size: 18px;
 	margin: 0px 0px 5px 0px;	
 }
+
+
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 39dce3c4..88adca00 100644
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -109,9 +109,9 @@ element.style {
 } 
 #logo{
     margin: auto;
-    width: 50%;
+    width: 100%;
     border: 1px solid #54A5AF;
-    padding: 10px;
+    padding: 0px;
 }
 
 #instance_img{
diff --git a/app/assets/stylesheets/inventory_definitions.scss b/app/assets/stylesheets/inventory_definitions.scss
index 538c2918..e7fc208e 100644
--- a/app/assets/stylesheets/inventory_definitions.scss
+++ b/app/assets/stylesheets/inventory_definitions.scss
@@ -1,3 +1,272 @@
-// Place all the styles related to the inventory_definitions controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
+@import "bootstrap";
+@import "font-awesome";
+@import "theme";
+@import "jquery-ui";
+@import "bootstrap-datepicker3";
+@import "select2";
+@import "jquery.datetimepicker";
+
+/* Show it is fixed to the top */
+// body {
+//   min-height: 75rem;
+//   padding-top: 4.5rem;
+// }
+.card-columns {
+  font-size: 18px !important;
+}
+
+.others-payment{
+  line-height:100px;
+  text-align:center;
+  color:white;
+  width:300px;
+  height:100px;
+  font-size:18px;
+}
+
+.orders-table {
+  cursor: pointer;
+}
+
+.cashier_number{
+  width: 33%;
+  height:70px;
+  line-height:70px;
+  text-align:center;
+  background:#54A5AF;
+  // float:left;
+  // margin:2px;
+  font-size:20px;
+  color:white;
+  // cursor:pointer;
+}
+
+.del_cashier_number{
+  opacity:0.6,
+}
+
+.pay{
+  width: 98%;
+  height:211px;
+  line-height:211px;
+  text-align:center;
+  font-size:20px;
+  color:white;
+}
+
+.payment{
+  height:70px;line-height:70px;
+  align:center;
+  color:white;
+  font-size:16px;
+  margin-top:5px;
+}
+
+.cash-color{
+  background-color:#80CBC4;
+}
+
+.credit-color{
+  background-color:#FFCCBC;
+}
+
+.other-payment-color{
+  background-color:#E1BEE7;
+}
+
+.cashier_number:hover{
+  background:#A9F5F2;
+}
+
+.action-btn {
+  white-space: normal !important;
+  height: 60px;
+  margin-bottom: 5px;
+}
+
+.bottom-5 {
+  margin-bottom: 5px;
+}
+
+.fluid {
+  width: 100%;
+}
+
+.style2 {
+  border-top: 3px double #8c8b8b;
+}
+
+.long{
+  width:49%;
+}
+
+.sold {
+  background-color: red;
+}
+
+.paid {
+  background-color: green;
+}
+
+.selected-item {
+  color: #fff !important;
+  background-color: blue !important;
+}
+
+.selected-account {
+  color: #fff !important;
+  background-color: blue !important;
+}
+
+/* Reciept Style */
+#order-charges-table td {
+  border-top: none !important;
+}
+
+.charges-name {
+  width: 80%;
+  text-align: left;
+}
+
+.item-name {
+  width: 60%;
+  text-align: left;
+}
+
+.item-attr {
+  width: 20%;
+  text-align: right;
+}
+
+.item-attr-edit{
+  width: 10%;
+  text-align: left;
+}
+
+.display-none{
+  display: none;
+}
+
+.text-white{
+  color: #fff;
+}
+
+/* Colors */
+.purple {
+  background-color:#7a62d3;
+}
+
+.orange{
+  background-color:#FF7F50;
+}
+
+.red {
+  background-color:#ff0000;
+}
+
+.green{
+  background-color: #009900;
+}
+
+.orange{
+  background-color: #FF8C00;
+}
+
+.blue{
+  background-color: blue;
+}
+
+/* End Colors */
+
+.left{
+  margin-left:1px;
+}
+
+.bottom{
+  margin-bottom: 1px;
+}
+
+/*----- Reset -----*/
+
+select.form-control {
+  height: inherit !important;
+}
+
+.form-horizontal .form-group {
+  margin-right: 0px !important;
+}
+
+/*  Discount */
+
+.discount-item-row {
+  cursor: pointer;
+}
+
+tr.discount-item-row:hover {
+  background-color: #e3e3e3 !important;
+}
+.required abbr{
+  color: red !important;
+}
+
+/* Jquery Confirm */
+
+.jconfirm-box-container{
+  margin-left:-40px !important;
+  margin-top:-40px !important;
+}
+
+#sxModal {
+  display: none;
+  overflow: auto;
+  width: 100%;
+  height: 100%;
+  background-color: #000;
+  background-color: rgba(0,0,0,0.4);
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1100;
+}
+
+#sxModal-Content {
+  position: relative;
+  left: 42%;
+  top: 30%;
+  background-color: #d9534f;
+  color: #fff;
+  text-align: center;
+  width: 200px;
+  height: 200px;
+  padding-top: 5%;
+  border-radius: 100px;
+  z-index: 1101;
+}
+
+/*Loading gif for payment*/
+
+#loading_wrapper{
+
+  position: fixed;
+  background-color: #C8C8C8 ;
+  height: 100%;
+  width: 100%;
+  left: 0;
+  opacity: 0.6;
+  top: 0;
+  z-index: 9999999;
+}
+#loading{
+  position: relative;
+  height: 100%;
+  width: 100%;
+  background-image: url('../../../image/loading-ajax.gif');
+  background-position:  center center;
+  background-repeat: no-repeat;
+  opacity: 1;
+  filter: alpha(opacity=100); /* ie */
+  -moz-opacity: 1; /* mozilla */
+
+}
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
index a66bc071..b2cb741f 100644
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@@ -7,8 +7,12 @@ module ApplicationCable
 	end
 
 	# Order Queue Station Channel
-	class OQSChannel < ActionCable::Channel::Base
+	class OrderQueueStationChannel < ActionCable::Channel::Base
 		
 	end
 
+	# Order Queue Station Channel
+	class BillChannel < ActionCable::Channel::Base
+		
+	end
 end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index 0ff5442f..9da60bf4 100644
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -1,4 +1,7 @@
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
+  	def connect
+  		logger.add_tags "ActionCable"
+  	end
   end
 end
diff --git a/app/channels/bill_channel.rb b/app/channels/bill_channel.rb
new file mode 100644
index 00000000..ed5efbe6
--- /dev/null
+++ b/app/channels/bill_channel.rb
@@ -0,0 +1,10 @@
+class BillChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "bill_channel"
+  end
+
+  def unsubscribed
+  	# Any cleanup needed when channel is unsubscribed
+  	stop_all_streams    
+  end
+end
diff --git a/app/channels/order_channel.rb b/app/channels/order_channel.rb
new file mode 100644
index 00000000..d261e48b
--- /dev/null
+++ b/app/channels/order_channel.rb
@@ -0,0 +1,10 @@
+class OrderChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "order_channel"
+  end
+
+  def unsubscribed
+  	stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+end
diff --git a/app/channels/order_queue_station_channel.rb b/app/channels/order_queue_station_channel.rb
index 8206c64b..b815a446 100644
--- a/app/channels/order_queue_station_channel.rb
+++ b/app/channels/order_queue_station_channel.rb
@@ -4,6 +4,7 @@ class OrderQueueStationChannel < ApplicationCable::Channel
   end
 
   def unsubscribed
+  	stop_all_streams
     # Any cleanup needed when channel is unsubscribed
   end
 
diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 2b323d0f..ac12e453 100644
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -7,8 +7,11 @@ class Api::BillController < Api::ApiController
     @error_message = "Order ID or Booking ID is require to request for a bill."
     if ShiftSale.current_shift
     #create Bill by Booking ID
+      table = 0
       if (params[:booking_id])
         booking  = Booking.find(params[:booking_id])
+        # for Job
+        table = DiningFacility.find(booking.dining_facility_id)
 
           if booking
             if booking.sale_id.nil?
@@ -23,8 +26,14 @@ class Api::BillController < Api::ApiController
       elsif (params[:order_id])
         @sale = Sale.new
         @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
+
+        # for Job
+        booking  = Booking.find_by_sale_id(@sale_id)
+        table = DiningFacility.find(booking.dining_facility_id)
       end
       Promotion.promo_activate(@sale)
+
+      BillBroadcastJob.perform_later(table)
     else
       @status = false
       @error_message = "No Current Open Shift"
diff --git a/app/controllers/api/restaurant/menu_item_attributes_controller.rb b/app/controllers/api/restaurant/menu_item_attributes_controller.rb
index 1b6a48d4..37719c37 100644
--- a/app/controllers/api/restaurant/menu_item_attributes_controller.rb
+++ b/app/controllers/api/restaurant/menu_item_attributes_controller.rb
@@ -1,9 +1,12 @@
 class Api::Restaurant::MenuItemAttributesController < Api::ApiController
-
+	skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
   def index
     @menu_attributes = MenuItemAttribute.all
   end
+   def show
+    @attribute = MenuItemAttribute.find(params[:id])
+  end
 end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index ead69f39..54534c4f 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -58,14 +58,7 @@ class HomeController < ApplicationController
   end
 
   def dashboard
-    # if @employee && @employee.role == "cashier"
-    #
-    # elsif  @employee && @employee.role == "waiter"
-    # elsif  @employee && @employee.role == "administrator"
-    # elsif  @employee && @employee.role == "manager"
-    # elsif  @employee && @employee.role == "supervisour"
-    #   redirect_to dashboard_path
-    # end
+    @shop = Shop.first
   end
 
   def destroy
diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index 7a8f17e1..33b7dd75 100644
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -25,7 +25,7 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
   # POST /inventory_definitions.json
   def create
     @inventory_definition = InventoryDefinition.new(inventory_definition_params)
-
+    @inventory_definition.created_by = current_user.id
     respond_to do |format|
       if @inventory_definition.save
         format.html { redirect_to inventory_path, notice: 'Inventory definition was successfully created.' }
diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index 9ff9fce7..52d183de 100644
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -1,7 +1,7 @@
 class Inventory::StockChecksController < BaseInventoryController
-
   def index
     @check = StockCheck.new
+    @inventory_definitions = InventoryDefinition.active.all
   end
 
   def create
@@ -28,87 +28,86 @@ class Inventory::StockChecksController < BaseInventoryController
     stockcheck = StockCheck.find(stock_id)
     stockcheck_items = stockcheck.stock_check_items
     member_info = nil
-    unique_code = "StockPrint"
-    
+    unique_code = 'StockPrint'
+
     shop_details = Shop.find(1)
     checker = Employee.find(stockcheck.check_by)
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    print_settings = PrintSetting.find_by_unique_code(unique_code)
     printer = Printer::ReceiptPrinter.new(print_settings)
 
-    printer.print_stock_check_result(print_settings,stockcheck, stockcheck_items,checker.name, shop_details)
-
+    printer.print_stock_check_result(print_settings, stockcheck, stockcheck_items, checker.name, shop_details)
   end
 
   # before_action :set_stock_check, only: [:show, :edit, :update, :destroy]
 
   # GET /stock_checks
   # GET /stock_checks.json
-#   def index
-#     @stock_checks = StockCheck.all
-#   end
-#
-#   # GET /stock_checks/1
-#   # GET /stock_checks/1.json
-#   def show
-#   end
-#
-#   # GET /stock_checks/new
-#   def new
-#     @stock_check = StockCheck.new
-#   end
-#
-#   # GET /stock_checks/1/edit
-#   def edit
-#   end
-#
-#   # POST /stock_checks
-#   # POST /stock_checks.json
-#   def create
-#     @stock_check = StockCheck.new(stock_check_params)
-#
-#     respond_to do |format|
-#       if @stock_check.save
-#         format.html { redirect_to @stock_check, notice: 'Stock check was successfully created.' }
-#         format.json { render :show, status: :created, location: @stock_check }
-#       else
-#         format.html { render :new }
-#         format.json { render json: @stock_check.errors, status: :unprocessable_entity }
-#       end
-#     end
-#   end
-#
-#   # PATCH/PUT /stock_checks/1
-#   # PATCH/PUT /stock_checks/1.json
-#   def update
-#     respond_to do |format|
-#       if @stock_check.update(stock_check_params)
-#         format.html { redirect_to @stock_check, notice: 'Stock check was successfully updated.' }
-#         format.json { render :show, status: :ok, location: @stock_check }
-#       else
-#         format.html { render :edit }
-#         format.json { render json: @stock_check.errors, status: :unprocessable_entity }
-#       end
-#     end
-#   end
-#
-#   # DELETE /stock_checks/1
-#   # DELETE /stock_checks/1.json
-#   def destroy
-#     @stock_check.destroy
-#     respond_to do |format|
-#       format.html { redirect_to stock_checks_url, notice: 'Stock check was successfully destroyed.' }
-#       format.json { head :no_content }
-#     end
-#   end
-#
-#   private
-#     # Use callbacks to share common setup or constraints between actions.
-#     def set_stock_check
-#       @stock_check = StockCheck.find(params[:id])
-#     end
-#
-#     # Never trust parameters from the scary internet, only allow the white list through.
-#     def stock_check_params
-#       params.fetch(:stock_check, {})
-#     end
+  #   def index
+  #     @stock_checks = StockCheck.all
+  #   end
+  #
+  #   # GET /stock_checks/1
+  #   # GET /stock_checks/1.json
+  #   def show
+  #   end
+  #
+  #   # GET /stock_checks/new
+  #   def new
+  #     @stock_check = StockCheck.new
+  #   end
+  #
+  #   # GET /stock_checks/1/edit
+  #   def edit
+  #   end
+  #
+  #   # POST /stock_checks
+  #   # POST /stock_checks.json
+  #   def create
+  #     @stock_check = StockCheck.new(stock_check_params)
+  #
+  #     respond_to do |format|
+  #       if @stock_check.save
+  #         format.html { redirect_to @stock_check, notice: 'Stock check was successfully created.' }
+  #         format.json { render :show, status: :created, location: @stock_check }
+  #       else
+  #         format.html { render :new }
+  #         format.json { render json: @stock_check.errors, status: :unprocessable_entity }
+  #       end
+  #     end
+  #   end
+  #
+  #   # PATCH/PUT /stock_checks/1
+  #   # PATCH/PUT /stock_checks/1.json
+  #   def update
+  #     respond_to do |format|
+  #       if @stock_check.update(stock_check_params)
+  #         format.html { redirect_to @stock_check, notice: 'Stock check was successfully updated.' }
+  #         format.json { render :show, status: :ok, location: @stock_check }
+  #       else
+  #         format.html { render :edit }
+  #         format.json { render json: @stock_check.errors, status: :unprocessable_entity }
+  #       end
+  #     end
+  #   end
+  #
+  #   # DELETE /stock_checks/1
+  #   # DELETE /stock_checks/1.json
+  #   def destroy
+  #     @stock_check.destroy
+  #     respond_to do |format|
+  #       format.html { redirect_to stock_checks_url, notice: 'Stock check was successfully destroyed.' }
+  #       format.json { head :no_content }
+  #     end
+  #   end
+  #
+  #   private
+  #     # Use callbacks to share common setup or constraints between actions.
+  #     def set_stock_check
+  #       @stock_check = StockCheck.find(params[:id])
+  #     end
+  #
+  #     # Never trust parameters from the scary internet, only allow the white list through.
+  #     def stock_check_params
+  #       params.fetch(:stock_check, {})
+  #     end
 end
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index dae8b02f..af843c7e 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -131,6 +131,7 @@ class Oqs::HomeController < BaseOqsController
               left join dining_facilities as df on df.id = bk.dining_facility_id")
     .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
+    .order("assigned_order_items.assigned_order_item_id desc")
     .group("assigned_order_items.assigned_order_item_id")
 
   end
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 1f9d70f3..6c9127ae 100644
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -30,10 +30,19 @@ class Origami::AddordersController < BaseOrigamiController
     else
       @booking = nil
     end
-
-
   end
 
+  def get_menu_category ()
+    if (params[:id])
+      #Pull this menu
+      @menu = MenuCategory.find_by_id(params[:id])
+      return @menu
+    else
+      MenuCategory.current_menu
+    end
+  end
+  
+
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 1e14fbc5..8fddfa0f 100644
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -127,88 +127,91 @@ class Origami::DiscountsController < BaseOrigamiController
 
   # Member Discount
   def member_discount
-    sale_id = params[:sale_id]
-    # account_types = JSON.parse(params[:account_types])
-    account_types =  Account.where("discount=?",true)
-    sub_total = params[:sub_total]
-    sale      = Sale.find(sale_id)
-    price     = SaleItem.calculate_price_by_accounts(sale.sale_items)
-
-    arr = Array.new;
-
-    account_types.each do |at|
-      price.each do |pc|
-        if pc[:name] == at.title && pc[:price]>0
-           str={type:pc[:name],amount:pc[:price]}
-           arr.push(str)
-        end
-      end 
-    end
-
-    generic_customer_id = sale.customer.membership_id
-
-    receipt_no        = sale.receipt_no
-    membership        = MembershipSetting.find_by_membership_type("paypar_url")
-    memberaction      = MembershipAction.find_by_membership_type("member_discount")
-    merchant_uid      = memberaction.merchant_account_id.to_s
-    campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
-    auth_token        = memberaction.auth_token.to_s
-    url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
-
-    # Check for items for Paypar Cloud
-    if arr.length > 0
-      begin
-      response        = HTTParty.post(url, 
-                              :body => { account_no: nil,
-                                        generic_customer_id:generic_customer_id ,
-                                         campaign_type_id: campaign_type_id,
-                                         receipt_no: receipt_no,
-                                         merchant_uid:merchant_uid,
-                                         campaign_method:arr.to_json,
-                                         total_sale_transaction_amount: sale.grand_total,
-                                         auth_token:auth_token}.to_json,
-                              :headers => {
-                                  'Content-Type' => 'application/json',
-                                  'Accept'       => 'application/json'
-                       }, :timeout => 10)
-      rescue HTTParty::Error
-        response = {:status=> false, :message => "Can't open membership server " }
-
-      rescue Net::OpenTimeout
-        response = {:status=> false, :message => "Can't open membership server " }
-      rescue OpenURI::HTTPError
-        response = {:status=> false, :message => "Can't open membership server " }
-
-      rescue SocketError
-        response = {:status=> false, :message => "Can't open membership server " }
-      end
-    else 
-      response = {:status=> false, :message => "You have no selected discount item" }
-    end
-  
-    table_id = sale.bookings[0].dining_facility_id
-    table_type = DiningFacility.find(table_id).type
-
-    # Re-calc All Amount in Sale
-    if response["status"] == true
-        discount_amount = response["discount_earned"]
-        if response["discount_bonus_earned"]
-          discount_amount = discount_amount + response["discount_bonus_earned"]
-        end
-        sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount')
-        result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type }
-    end
-       
-    if response["status"] == "500"
-        result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
-    end 
-     if !response.nil?
-      if response[:status] == false
-        result = {:status=> response[:message],:title=>"Alert", :table_id => table_id,:table_type => table_type }
-      end
-     end
     
-    render :json => result.to_json
+    sale_id         = params[:sale_id]
+    is_card         = params[:is_card]
+    sub_total       = params[:sub_total]
+    sale            = Sale.find(sale_id)
+
+    # Check for Card Payment
+    is_card_payment = SaleItem.get_sale_payments_by_card(sale.sale_payments)
+   
+    if is_card_payment  != true
+      account_types =  Account.where("discount=?",true)
+      table_id      = sale.bookings[0].dining_facility_id
+      table_type    = DiningFacility.find(table_id).type
+
+      # Get Prices for each accounts (eg: food, beverage)
+      account_price = SaleItem.calculate_price_by_accounts(sale.sale_items)
+      acc_prices    = Array.new;
+
+      account_types.each do |at|
+        account_price.each do |pc|
+          if pc[:name] == at.title && pc[:price]>0
+             str={type:pc[:name],amount:pc[:price]}
+             acc_prices.push(str)
+          end
+        end 
+      end
+
+      generic_customer_id = sale.customer.membership_id
+      receipt_no          = sale.receipt_no
+      membership          = MembershipSetting.find_by_membership_type("paypar_url")
+      memberaction        = MembershipAction.find_by_membership_type("member_discount")
+      merchant_uid        = memberaction.merchant_account_id.to_s
+      campaign_type_id    = memberaction.additional_parameter["campaign_type_id"]
+      auth_token          = memberaction.auth_token.to_s
+      url                 = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+
+      # Check for items for Paypar Cloud
+      if acc_prices.length > 0
+          begin
+          response        = HTTParty.post(url, 
+                                  :body => { account_no: nil,
+                                            generic_customer_id:generic_customer_id ,
+                                             campaign_type_id: campaign_type_id,
+                                             receipt_no: receipt_no,
+                                             merchant_uid:merchant_uid,
+                                             campaign_method:acc_prices.to_json,
+                                             total_sale_transaction_amount: sale.grand_total,
+                                             is_card: is_card,
+                                             auth_token:auth_token}.to_json,
+                                  :headers => {
+                                      'Content-Type' => 'application/json',
+                                      'Accept'       => 'application/json'
+                           }, :timeout => 10)
+          rescue HTTParty::Error
+            response = {"status": false, "message": "Can't open membership server " }
+
+          rescue Net::OpenTimeout
+            response = {"status": false, "message": "Can't open membership server " }
+          rescue OpenURI::HTTPError
+            response = {"status": false, "message": "Can't open membership server " }
+
+          rescue SocketError
+            response = {"status": false, "message": "Can't open membership server " }
+          end
+      else 
+          response = {"status": false, "message": "You have no selected discount item" }
+      end
+      
+      # Re-calc All Amount in Sale
+      if response["status"] == true
+          discount_amount   = response["discount_earned"]
+          if response["discount_bonus_earned"]
+            discount_amount = discount_amount + response["discount_bonus_earned"]
+          end
+          sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount')
+          result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type }
+      elsif response["status"] == "500"
+          result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
+      else
+        result = {:status=> response["message"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
+      end
+
+      render :json => result.to_json
+
+    end #end Is Card Payment
   end
 
   #discount for selected order
diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb
new file mode 100644
index 00000000..eaf23c5a
--- /dev/null
+++ b/app/controllers/origami/in_duties_controller.rb
@@ -0,0 +1,170 @@
+class Origami::InDutiesController < BaseOrigamiController
+  before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
+
+  # GET /in_duties
+  # GET /in_duties.json
+  def index
+    @in_duties = InDuty.all
+  end
+
+  def index_in_duty
+    @duty_in = InDuty.where('dinning_id=?', params[:table_id])
+    @table = DiningFacility.find(params[:table_id])
+    @in_duty = InDuty.new
+    @duties_in = Kaminari.paginate_array(@duty_in).page(params[:page]).per(10)
+  end
+
+  # GET /in_duties/1
+  # GET /in_duties/1.json
+  def show; end
+
+  # GET /in_duties/new
+  def new
+    # this one use for new
+    @in_duty = InDuty.new
+    @table = DiningFacility.find(params[:table_id])
+    @commissioner = @in_duty.commissioner
+    render partial: 'form'
+  end
+
+  # GET /in_duties/1/edit
+  def edit; end
+
+  def edit_in_duty
+    @in_duty = InDuty.find(params[:id])
+    @table = DiningFacility.find(params[:table_id])
+    @commissioner = @in_duty.commissioner
+
+    # render json: {in_duty: @in_duty, commissioner: @commissioner}
+    render partial: 'form'
+  end
+
+  def assign_in_duty
+    @in_duty = InDuty.new
+    @table = DiningFacility.find(params[:table_id])
+  end
+
+  # POST /in_duties
+  # POST /in_duties.json
+  def create
+    @in_duty = InDuty.new(in_duty_params)
+
+    respond_to do |format|
+      if @in_duty.save
+        format.html { redirect_to origami_in_duties_path, notice: 'In duty was successfully created.' }
+        format.json { render :show, status: :created, location: @in_duty }
+      else
+        format.html { render :new }
+        format.json { render json: @in_duty.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def create_for_in_duty
+    # this one use for create and update
+    in_duty = in_duty_params
+    in_time = DateTime.new in_duty['in_time(1i)'].to_i, in_duty['in_time(2i)'].to_i, in_duty['in_time(3i)'].to_i, in_duty['in_time(4i)'].to_i, in_duty['in_time(5i)'].to_i
+    in_time = in_time.change(offset: '+06:30')
+    out_time = DateTime.new in_duty['out_time(1i)'].to_i, in_duty['out_time(2i)'].to_i, in_duty['out_time(3i)'].to_i, in_duty['out_time(4i)'].to_i, in_duty['out_time(5i)'].to_i
+    out_time = out_time.change(offset: '+06:30')
+    @in_duty = InDuty.new
+    in_duty_id = in_duty[:id]
+    unless in_duty_id.empty?
+      @in_duty = InDuty.find(in_duty_id.to_i)
+    end
+
+    @in_duty.dinning_id = in_duty_params[:dinning_id]
+    @in_duty.commissioner_ids = in_duty_params[:commissioner_ids]
+    @in_duty.in_time = in_time
+    @in_duty.out_time = out_time
+
+    respond_to do |format|
+      if @in_duty.save
+        if in_duty_id.nil?
+          format.html { redirect_to origami_index_in_duty_path(in_duty_params[:dinning_id]), notice: 'In duty was successfully created.' }
+          format.json { render :show, status: :created, location: @in_duty }
+        else
+          format.html { redirect_to origami_index_in_duty_path(in_duty_params[:dinning_id]), notice: 'In duty was successfully updated.' }
+          format.json { render :show, status: :created, location: @in_duty }
+        end
+      else
+        format.html { render :new }
+        format.json { render json: @in_duty.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /in_duties/1
+  # PATCH/PUT /in_duties/1.json
+  def update
+    in_duty = in_duty_params
+    in_time = DateTime.new in_duty['in_time(1i)'].to_i, in_duty['in_time(2i)'].to_i, in_duty['in_time(3i)'].to_i, in_duty['in_time(4i)'].to_i, in_duty['in_time(5i)'].to_i
+    in_time = in_time.change(offset: '+06:30')
+    out_time = DateTime.new in_duty['out_time(1i)'].to_i, in_duty['out_time(2i)'].to_i, in_duty['out_time(3i)'].to_i, in_duty['out_time(4i)'].to_i, in_duty['out_time(5i)'].to_i
+    out_time = out_time.change(offset: '+06:30')
+    @in_duty.commissioner_ids = in_duty_params[:commissioner_ids]
+    @in_duty.in_time = in_time
+    @in_duty.out_time = out_time
+    respond_to do |format|
+      if @in_duty.save
+        format.html { redirect_to origami_index_in_duty_path(in_duty_params[:dinning_id]), notice: 'In duty was successfully updated.' }
+        format.json { render :show, status: :ok, location: @in_duty }
+      else
+        format.html { render :edit }
+        format.json { render json: @in_duty.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def update_for_in_duty
+    in_duty = in_duty_params
+    in_time = DateTime.new in_duty['in_time(1i)'].to_i, in_duty['in_time(2i)'].to_i, in_duty['in_time(3i)'].to_i, in_duty['in_time(4i)'].to_i, in_duty['in_time(5i)'].to_i
+    in_time = in_time.change(offset: '+06:30')
+    out_time = DateTime.new in_duty['out_time(1i)'].to_i, in_duty['out_time(2i)'].to_i, in_duty['out_time(3i)'].to_i, in_duty['out_time(4i)'].to_i, in_duty['out_time(5i)'].to_i
+    out_time = out_time.change(offset: '+06:30')
+    @in_duty.commissioner_ids = in_duty_params[:commissioner_ids]
+    @in_duty.in_time = in_time
+    @in_duty.out_time = out_time
+    respond_to do |format|
+      if @in_duty.save
+        format.html { redirect_to origami_index_in_duty_path(in_duty_params[:dinning_id]), notice: 'In duty was successfully updated.' }
+        format.json { render :show, status: :ok, location: @in_duty }
+      else
+        format.html { render :edit }
+        format.json { render json: @in_duty.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /in_duties/1
+  # DELETE /in_duties/1.json
+  def destroy
+    @in_duty.destroy
+    respond_to do |format|
+      format.html { redirect_to origami_in_duties_path, notice: 'In duty was successfully removed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  def destroy_in_duty
+    @table_id = params[:table_id]
+    @in_duty.destroy
+
+    respond_to do |format|
+      format.html { redirect_to origami_index_in_duty_path(@table_id), notice: 'In duty was successfully removed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_in_duty
+    @in_duty = InDuty.find(params[:id])
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def in_duty_params
+    params.require(:in_duty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time)
+  end
+end
diff --git a/app/controllers/origami/in_juties_controller.rb b/app/controllers/origami/in_juties_controller.rb
deleted file mode 100644
index ff76d3b1..00000000
--- a/app/controllers/origami/in_juties_controller.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-class Origami::InJutiesController < BaseOrigamiController
-  before_action :set_in_juty, only: %i[show edit update edit_in_juty update_for_in_juty destroy destroy_in_juty]
-
-  # GET /in_juties
-  # GET /in_juties.json
-  def index
-    @in_juties = InJuty.all
-  end
-
-  def index_in_juty
-    @juty_in = InJuty.where('dinning_id=?', params[:table_id])
-    @table = DiningFacility.find(params[:table_id])
-    @in_juty = InJuty.new
-    @juties_in = Kaminari.paginate_array(@juty_in).page(params[:page]).per(10)
-  end
-
-  # GET /in_juties/1
-  # GET /in_juties/1.json
-  def show
-  end
-
-  # GET /in_juties/new
-  def new
-    # this one use for new
-    @in_juty = InJuty.new
-    @table = DiningFacility.find(params[:table_id])
-    @commissioner = @in_juty.commissioner
-    render partial: 'form'
-  end
-
-  # GET /in_juties/1/edit
-  def edit
-  end
-
-  def edit_in_juty
-    @in_juty = InJuty.find(params[:id])
-    @table = DiningFacility.find(params[:table_id])
-    @commissioner = @in_juty.commissioner
-
-    # render json: {in_juty: @in_juty, commissioner: @commissioner}
-    render partial: 'form'
-  end
-
-  def assign_in_juty
-    @in_juty = InJuty.new
-    @table = DiningFacility.find(params[:table_id])
-  end
-
-  # POST /in_juties
-  # POST /in_juties.json
-  def create
-    @in_juty = InJuty.new(in_juty_params)
-
-    respond_to do |format|
-      if @in_juty.save
-        format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully created.' }
-        format.json { render :show, status: :created, location: @in_juty }
-      else
-        format.html { render :new }
-        format.json { render json: @in_juty.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def create_for_in_juty
-    # this one use for create and update
-    in_juty = in_juty_params
-    in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i
-    in_time = in_time.change(offset: '+06:30')
-    out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i
-    out_time = out_time.change(offset: '+06:30')
-    @in_juty = InJuty.new
-    in_juty_id = in_juty[:id]
-    unless in_juty_id.nil?
-      @in_juty = InJuty.find(in_juty_id.to_i)
-    end
-
-    @in_juty.dinning_id = in_juty_params[:dinning_id]
-    @in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
-    @in_juty.in_time = in_time
-    @in_juty.out_time = out_time
-
-    respond_to do |format|
-      if @in_juty.save
-        if in_juty_id.nil?
-          format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully created.' }
-          format.json { render :show, status: :created, location: @in_juty }
-        else
-          format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' }
-          format.json { render :show, status: :created, location: @in_juty }
-        end
-      else
-        format.html { render :new }
-        format.json { render json: @in_juty.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /in_juties/1
-  # PATCH/PUT /in_juties/1.json
-  def update
-    in_juty = in_juty_params
-    in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i
-    in_time = in_time.change(offset: '+06:30')
-    out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i
-    out_time = out_time.change(offset: '+06:30')
-    @in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
-    @in_juty.in_time = in_time
-    @in_juty.out_time = out_time
-    respond_to do |format|
-      if @in_juty.save
-        format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' }
-        format.json { render :show, status: :ok, location: @in_juty }
-      else
-        format.html { render :edit }
-        format.json { render json: @in_juty.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def update_for_in_juty
-    in_juty = in_juty_params
-    in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i
-    in_time = in_time.change(offset: '+06:30')
-    out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i
-    out_time = out_time.change(offset: '+06:30')
-    @in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
-    @in_juty.in_time = in_time
-    @in_juty.out_time = out_time
-    respond_to do |format|
-      if @in_juty.save
-        format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' }
-        format.json { render :show, status: :ok, location: @in_juty }
-      else
-        format.html { render :edit }
-        format.json { render json: @in_juty.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /in_juties/1
-  # DELETE /in_juties/1.json
-  def destroy
-    @in_juty.destroy
-    respond_to do |format|
-      format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully removed.' }
-      format.json { head :no_content }
-    end
-  end
-
-  def destroy_in_juty
-    @table_id = params[:table_id]
-    @in_juty.destroy
-
-    respond_to do |format|
-      format.html { redirect_to origami_index_in_juty_path(@table_id), notice: 'In juty was successfully removed.' }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-
-  # Use callbacks to share common setup or constraints between actions.
-  def set_in_juty
-    @in_juty = InJuty.find(params[:id])
-  end
-
-  # Never trust parameters from the scary internet, only allow the white list through.
-  def in_juty_params
-    params.require(:in_juty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time)
-  end
-end
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index 5bed3470..a8b77861 100644
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -17,6 +17,9 @@ class Origami::JcbController < BaseOrigamiController
     end
     @can_jcb = total - @jcbcount - others
 
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 67107167..ba97cad9 100644
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -16,6 +16,9 @@ class Origami::MasterController < BaseOrigamiController
         end
     end
     @can_master = total - @mastercount - others
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 3707d1f4..c9f707e3 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -5,9 +5,10 @@ class Origami::MpuController < BaseOrigamiController
 
     # limit mpu_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total     = sale_data.grand_total
     @mpucount = 0
-    others = 0
+    others    = 0
+
     sale_data.sale_payments.each do |sale_payment|
         if sale_payment.payment_method == "mpu"
           @mpucount = @mpucount + sale_payment.payment_amount
@@ -17,6 +18,9 @@ class Origami::MpuController < BaseOrigamiController
     end
     @can_mpu = total - @mpucount - others
 
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 109138a5..2a9fe5d9 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -75,6 +75,8 @@ class Origami::PaymentsController < BaseOrigamiController
 
   def show
     sale_id = params[:sale_id]
+
+    @member_discount = MembershipSetting.find_by_discount(1)
     
     if Sale.exists?(sale_id)
       @cash = 0.0
diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index ada68f59..74dd8095 100644
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -1,4 +1,4 @@
-class Origami::ProductCommissionsController < ApplicationController
+class Origami::ProductCommissionsController < BaseOrigamiController
   before_action :set_product_commission, only: [:show, :edit, :update, :destroy]
 
   # GET /product_commissions
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 900b0431..61c8b00f 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -1,5 +1,5 @@
 class Origami::SaleEditController < BaseOrigamiController
-  authorize_resource :class => false
+  authorize_resource class: false
   # Index for sale item void OR edit
   def edit
     sale_id = params[:sale_id]
@@ -19,12 +19,13 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem.qty = saleitemObj.qty * -1
     @newsaleitem.price = saleitemObj.price * -1
     @newsaleitem.is_taxable = 1
-    @newsaleitem.product_name = saleitemObj.product_name + " - void"
+    @newsaleitem.product_name = saleitemObj.product_name + ' - void'
     @newsaleitem.save
 
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
     saleObj.compute_without_void
+    ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
   end
 
   def item_foc
@@ -44,6 +45,7 @@ class Origami::SaleEditController < BaseOrigamiController
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
     saleObj.compute_without_void
+    ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
   end
 
   # def item_edit
@@ -77,14 +79,19 @@ class Origami::SaleEditController < BaseOrigamiController
     saleitemObj.unit_price = update_price
     saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
     # saleitemObj.remark        = 'edit'
-    saleitemObj.product_name = saleitemObj.product_name + " - updated"
+
+    unless saleitemObj.product_name.include? 'updated'
+      saleitemObj.product_name = saleitemObj.product_name + ' - updated'
+    end
+    
     saleitemObj.save
 
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
     saleObj.compute_without_void
-  end
 
+    ProductCommission.edit_product_commission(saleitemObj)
+  end
 
   # make cancel void item
   def item_void_cancel
@@ -102,6 +109,7 @@ class Origami::SaleEditController < BaseOrigamiController
     # re-calc tax
     saleObj = Sale.find(saleitemObj.sale_id)
     saleObj.compute_without_void
+    ProductCommission.remove_product_commission(saleitemObj)
   end
 
   # remove all void items
@@ -115,6 +123,7 @@ class Origami::SaleEditController < BaseOrigamiController
         item.remark = nil
       end
       item.save
+      ProductCommission.remove_product_commission(item)
     end
 
     # re-calc tax
@@ -125,5 +134,8 @@ class Origami::SaleEditController < BaseOrigamiController
     sale_id = params[:sale_id]
     saleObj = Sale.find(sale_id)
     saleObj.compute_without_void
+    saleObj.sale_items.each do |item|
+      ProductCommission.remove_product_commission(item)
+    end
   end
 end
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 3cb8cabb..552d960b 100644
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -16,6 +16,9 @@ class Origami::VisaController < BaseOrigamiController
         end
     end
     @can_visa = total - @visacount - others
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
new file mode 100644
index 00000000..c6799cb1
--- /dev/null
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -0,0 +1,48 @@
+class Reports::StockCheckController < BaseReportController
+  # authorize_resource :class => false
+
+  def index
+    from_date = DateTime.now.beginning_of_day.utc.getlocal
+    to_date = DateTime.now.end_of_day.utc.getlocal
+    unless params[:daterange].blank?
+      from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal
+      to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
+      @daterange = params[:daterange]
+    end
+    @item_code = params[:item_code]
+    @inventory_definitions = InventoryDefinition.active.all
+
+    @transaction = StockCheckItem.get_transaction(from_date, to_date, @item_code)
+    @from       = from_date
+    @to         = to_date
+
+    respond_to do |format|
+      format.html
+      format.xls
+    end
+  end
+
+  def show
+    from, to  = get_date_range_from_params
+
+    @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
+    date_arr = Array.new
+    @sale_data.each do |sale|
+      local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
+      local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
+      opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
+      closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
+      shift_id = sale.id.nil? ? '-' : sale.id
+      str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
+      date_arr.push(str)
+    end
+
+    out = {:status => 'ok', :message => date_arr}
+
+    respond_to do |format|
+      format.json { render json: out }
+    end
+  end
+end
+
diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb
index 6b5f8652..ac2acc7f 100644
--- a/app/controllers/settings/menu_item_instances_controller.rb
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -92,12 +92,14 @@ class Settings::MenuItemInstancesController < ApplicationController
     category = MenuCategory.find(id)
 
     # Bind for Item Sets
-    if params[:menu_item_instance][:item_sets].count > 1
+    if params[:menu_item_instance][:item_sets].count > 0
       params[:menu_item_instance][:item_sets].delete_at(0)
 
       sets = ItemSet.find(params[:menu_item_instance][:item_sets])
 
-      if sets.count > 0
+      if sets.count >= 0
+        # destroy all item sets for edit
+        @settings_menu_item_instances.item_sets.destroy
         @settings_menu_item_instances.item_sets = sets
       end
     end
diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb
index af8bedc1..8acc7764 100644
--- a/app/controllers/settings/promotions_controller.rb
+++ b/app/controllers/settings/promotions_controller.rb
@@ -69,6 +69,9 @@ class Settings::PromotionsController < ApplicationController
   # DELETE /promotions/1
   # DELETE /promotions/1.json
   def destroy
+    @promotion.promotion_products.each do |pp|
+      pp.destroy
+    end
     @promotion.destroy
     respond_to do |format|
       format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully destroyed.' }
@@ -87,6 +90,21 @@ class Settings::PromotionsController < ApplicationController
     end
   end
 
+  def find_parent_item
+    res = []
+    item = MenuItemInstance.find_by_item_instance_code(params[:item_instance_code])
+    if item.nil?
+      product = Product.where("item_code = ?",params[:item_instance_code]).pluck(:name,:item_code)
+      res.push(product.name)
+      res.push(product.item_code)
+    else
+      # menu_item = item.menu_item.pluck(:name,:item_code)
+      res.push(item.item_instance_name)
+      res.push(item.menu_item.item_code)
+    end
+    render json: res
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_promotion
diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb
index a9e91a94..d37a59c9 100644
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -75,12 +75,14 @@ class Settings::SetMenuItemsController < ApplicationController
     params[:set_menu_item][:item_options].delete_at(0)
 
     # Bind for Item Sets
-    if params[:set_menu_item][:item_sets].count > 1
+    if params[:set_menu_item][:item_sets].count > 0
       params[:set_menu_item][:item_sets].delete_at(0)
 
       sets = ItemSet.find(params[:set_menu_item][:item_sets])
 
-      if sets.count > 0
+      if sets.count >= 0
+        # destroy all item sets for edit
+        @settings_menu_item.item_sets.destroy
         @settings_menu_item.item_sets = sets
       end
     end
diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb
index e3010e30..319934ca 100644
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/app/controllers/settings/simple_menu_items_controller.rb
@@ -98,12 +98,14 @@ class Settings::SimpleMenuItemsController < ApplicationController
     params[:simple_menu_item][:item_options].delete_at(0)
 
     # Bind for Item Sets
-    if params[:simple_menu_item][:item_sets].count > 1
+    if params[:simple_menu_item][:item_sets].count > 0
       params[:simple_menu_item][:item_sets].delete_at(0)
 
       sets = ItemSet.find(params[:simple_menu_item][:item_sets])
 
-      if sets.count > 0
+      if sets.count >= 0
+        # destroy all item sets for edit 
+        @settings_menu_item.item_sets.destroy
         @settings_menu_item.item_sets = sets
       end
     end
diff --git a/app/helpers/origami/in_duties_helper.rb b/app/helpers/origami/in_duties_helper.rb
new file mode 100644
index 00000000..afd35e07
--- /dev/null
+++ b/app/helpers/origami/in_duties_helper.rb
@@ -0,0 +1,2 @@
+module Origami::InDutiesHelper
+end
diff --git a/app/helpers/origami/in_juties_helper.rb b/app/helpers/origami/in_juties_helper.rb
deleted file mode 100644
index 2792da8d..00000000
--- a/app/helpers/origami/in_juties_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Origami::InJutiesHelper
-end
diff --git a/app/jobs/bill_broadcast_job.rb b/app/jobs/bill_broadcast_job.rb
new file mode 100644
index 00000000..d6be4d0a
--- /dev/null
+++ b/app/jobs/bill_broadcast_job.rb
@@ -0,0 +1,7 @@
+class BillBroadcastJob < ApplicationJob
+  queue_as :default
+
+  def perform(table)
+     ActionCable.server.broadcast "bill_channel",table: table
+  end
+end
diff --git a/app/jobs/order_broadcast_job.rb b/app/jobs/order_broadcast_job.rb
index 28a152ce..55ba2f21 100644
--- a/app/jobs/order_broadcast_job.rb
+++ b/app/jobs/order_broadcast_job.rb
@@ -1,9 +1,7 @@
 class OrderBroadcastJob < ApplicationJob
   queue_as :default
 
-  def perform(message)
-  	order = Order.find(message) # message come as order_id
-    ApplicationCable.server.broadcast "order_queue_station_channel", order: order
-
+  def perform(table)
+     ActionCable.server.broadcast "order_channel",table: table
   end
 end
diff --git a/app/jobs/order_queue_processor_job.rb b/app/jobs/order_queue_processor_job.rb
index 5b3423dc..96b08220 100644
--- a/app/jobs/order_queue_processor_job.rb
+++ b/app/jobs/order_queue_processor_job.rb
@@ -4,14 +4,24 @@ class OrderQueueProcessorJob < ApplicationJob
   def perform(order_id, table_id)
     # Do something later
     #Order ID    
-    order = Order.find(order_id)
     
-    #Loop through the order stations and process the items
+    order        = Order.find(order_id)
+    assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
+
     #Execute orders and send to order stations
     if order
       oqs = OrderQueueStation.new
       oqs.process_order(order, table_id)
     end
-
+    ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
   end
+
+  # private 
+
+  # def render_order(assign_order) 
+  #   ApplicationController.renderer.render(partial: 'oqs/oqs_test', 
+  #     locals: { order: assign_order}) 
+  # end
+# Read more at https://www.pluralsight.com/guides/ruby-ruby-on-rails/creating-a-chat-using-rails-action-cable#TehYiuqlHDOXaQQk.99
+
 end
diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb
index 3ac84077..34c97c6f 100644
--- a/app/models/assigned_order_item.rb
+++ b/app/models/assigned_order_item.rb
@@ -17,6 +17,29 @@ class AssignedOrderItem < ApplicationRecord
     assigned_order_item.save
   end
 
+  def self.assigned_order_item_by_job(order_id)
+    order_item = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id,
+                              assigned_order_items.order_queue_station_id, 
+                              oqs.id as station_id, oqs.station_name, 
+                              oqs.is_active, oqpz.zone_id, 
+                              df.name as zone, df.type as table_type, 
+                              odt.order_id, odt.item_code, odt.item_name, 
+                              odt.price, odt.qty, odt.item_order_by, odt.options, 
+                              cus.name as customer_name, odt.created_at")
+    .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
+              left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
+              left join orders as od ON od.order_id = assigned_order_items.order_id
+              left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id
+              left join customers as cus ON cus.customer_id = od.customer_id
+              left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+              left join bookings as bk on bk.booking_id = bo.booking_id
+              left join dining_facilities as df on df.id = bk.dining_facility_id")
+    .where("assigned_order_items.order_id = '#{order_id}'  AND assigned_order_items.delivery_status = false  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
+    .order("assigned_order_items.assigned_order_item_id desc")
+    .group("assigned_order_items.assigned_order_item_id")
+    return order_item
+  end
+
   private
   def generate_custom_id
     self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI")
diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb
index b7be007d..ae1b8f46 100644
--- a/app/models/dining_charge.rb
+++ b/app/models/dining_charge.rb
@@ -8,8 +8,8 @@ class DiningCharge < ApplicationRecord
       price = 0
       minutes = DiningCharge.time_diff(checkout, checkin)
       free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.utc.localtime.strftime('%H:%M'))
-      dining_minutes = minutes - free_time # stayminutes - free minutes
-      if dining_minutes <= 0
+      dining_minutes = minutes #- free_time # stayminutes - free minutes
+      if dining_minutes <= free_time
         price = 0
       else
         charge_type = dining_charges_obj.charge_type
diff --git a/app/models/in_juty.rb b/app/models/in_duty.rb
similarity index 78%
rename from app/models/in_juty.rb
rename to app/models/in_duty.rb
index 2f023ff0..485787c7 100644
--- a/app/models/in_juty.rb
+++ b/app/models/in_duty.rb
@@ -1,4 +1,4 @@
-class InJuty < ApplicationRecord
+class InDuty < ApplicationRecord
 	belongs_to :dining_facility, foreign_key: 'dinning_id'
 	belongs_to :commissioner, foreign_key: 'commissioner_ids'
 end
diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb
index de5be7b5..c8019063 100644
--- a/app/models/menu_item_instance.rb
+++ b/app/models/menu_item_instance.rb
@@ -6,14 +6,24 @@ class MenuItemInstance < ApplicationRecord
   # before_create :generate_menu_item_instance_code
 
   def self.findParentCategory(item)
-  	if item.menu_category_id
-      return item.menu_category_id
+    if item.menu_category_id
+      item.menu_category_id
     else
       parentitem = MenuItem.find(item.menu_item_id)
       findParentCategory(parentitem)
     end
   end
 
+  def self.get_item_name(item_code)
+    menu_item = MenuItemInstance.find_by_item_instance_code(item_code)
+    if menu_item.nil?
+      item_name = Product.find_by_item_code(item_code).name
+    else
+      item_name = menu_item.menu_item.name + ' - ' + menu_item.item_instance_name
+    end
+    item_name
+  end
+
   # private
 
   # def generate_menu_item_instance_code
diff --git a/app/models/order.rb b/app/models/order.rb
index 0551a1c9..1887585c 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -49,7 +49,7 @@ class Order < ApplicationRecord
       process_order_queue
 
       #send order to broadcast job
-      #send_order_broadcast
+      send_order_broadcast(booking)
 
       return true, booking
 
@@ -214,9 +214,10 @@ class Order < ApplicationRecord
 
 
   #send order items and send to order queue
-  def send_order_broadcast
+  def send_order_broadcast(booking)
+    table = DiningFacility.find(booking.dining_facility_id)
     #Send to background job for processing
-    OrderBroadcastJob.perform_later(self.id)
+    OrderBroadcastJob.perform_later(table)
   end
 
   #Origami: Cashier : to view order Table
diff --git a/app/models/product_commission.rb b/app/models/product_commission.rb
index 0e39f9f3..9b56e889 100644
--- a/app/models/product_commission.rb
+++ b/app/models/product_commission.rb
@@ -5,14 +5,67 @@ class ProductCommission < ApplicationRecord
   belongs_to :sale_item, foreign_key: 'sale_item_id'
   belongs_to :sale, foreign_key: 'sale_id'
 
+  def self.create_product_commission(newSaleItem, oldSaleItem)
+    old_product_commission = ProductCommission.find_by_sale_item_id(oldSaleItem.id)
+    return if old_product_commission.nil?
+    menu_item = MenuItem.find_by_item_code(newSaleItem.product_code)
+    return if menu_item.nil?
+    product_commission = ProductCommission.new
+    commission = Commission.where('product_code = ? AND is_active = ?', menu_item.id, true).take
+    product_commission.product_code = menu_item.id
+    product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type
+    unless commission.nil?
+      product_commission.commission_id = commission.id
+      if commission.commission_type == 'Percentage'
+        product_commission.price = newSaleItem.unit_price * (commission.amount / 100.0)
+        product_commission.amount = product_commission.price * newSaleItem.qty
+      elsif commission.commission_type == 'Net Amount'
+        product_commission.price = commission.amount
+        product_commission.amount = product_commission.price * newSaleItem.qty
+      end
+    end
+    unless old_product_commission.nil?
+      product_commission.commissioner_id = old_product_commission.commissioner_id
+    end
+    product_commission.qty = newSaleItem.qty
+    product_commission.sale_id = newSaleItem.sale_id
+    product_commission.sale_item_id = newSaleItem.sale_item_id
+    product_commission.save
+  end
+
+  def self.edit_product_commission(saleItemObj)
+    menu_item = MenuItem.find_by_item_code(saleItemObj.product_code)
+    commission = Commission.where('product_code = ? AND is_active = ?', menu_item.id, true).take
+    product_commission = ProductCommission.where('sale_item_id = ?', saleItemObj.id).take
+
+    return if commission.nil?
+    product_commission.qty = saleItemObj.qty
+    if commission.commission_type == 'Percentage'
+      product_commission.price = saleItemObj.unit_price * (commission.amount / 100.0)
+      product_commission.amount = product_commission.price * saleItemObj.qty
+    elsif commission.commission_type == 'Net Amount'
+      product_commission.price = commission.amount
+      product_commission.amount = product_commission.price * saleItemObj.qty
+    end
+    product_commission.save
+    puts 'Edit Product Commission Success'
+  end
+
+  def self.remove_product_commission(sale_item_id)
+    transaction = ProductCommission.find_by_sale_item_id(sale_item_id)
+    return if transaction.nil?
+    transaction.destroy
+    puts 'Remove Product Commission Success'
+  end
+
   def self.get_transaction(from, to, commissioner)
-    transaction = self.all
+    transaction = all
     if !from.nil? && !to.nil?
       transaction = transaction.where('updated_at between ? and ?', from, to)
     end
     if commissioner != 0
       transaction = transaction.where(commissioner_id: commissioner)
     end
-    return transaction
+    transaction
   end
 end
diff --git a/app/models/promotion.rb b/app/models/promotion.rb
index dfab86e9..021fda65 100644
--- a/app/models/promotion.rb
+++ b/app/models/promotion.rb
@@ -1,5 +1,5 @@
 class Promotion < ApplicationRecord
-  validates_presence_of  :promo_code,:promo_start_date,:promo_end_date,:promo_start_hour,:promo_end_hour,:promo_day,:promo_type,:original_product,:min_qty
+  validates_presence_of  :promo_code,:promo_start_date,:promo_end_date,:promo_start_hour,:promo_end_hour,:promo_type,:original_product,:min_qty
 
   has_many :promotion_products
 
@@ -23,13 +23,18 @@ class Promotion < ApplicationRecord
   end
 
   def self.is_between_promo_datetime(current_day,current_time) #database is not local time
-    promoList = Promotion.where("(TO_CHAR(promo_start_date, 'YYYY-MM-DD') <=? AND TO_CHAR(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
+    promoList = Promotion.where("(Date_Format(promo_start_date, 'YYYY-MM-DD') <=? AND Date_Format(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
     return promoList
   end
 
   def self.combine_item(saleObj)
-    order_id = saleObj.sale_orders[0].order_id
-    itemList = OrderItem.where("order_id = ?", order_id).group(:item_instance_code).sum(:qty)
+    # order_id = saleObj.sale_orders[0].order_id
+    # itemList = OrderItem.where("order_id = ?", order_id).group(:item_instance_code).sum(:qty)
+    itemList = []
+    saleObj.sale_orders.each do |so|
+      itemList << OrderItem.where("order_id = ?",so.order_id).group(:item_instance_code).sum(:qty)
+    end
+    return itemList
   end
 
   def self.is_promo_day(promoList, day, orderitemList, sale_id)
@@ -46,20 +51,29 @@ class Promotion < ApplicationRecord
 
   def self.find_promo_item(promo, orderitem, sale_id)
     #  item_code = OrderItem.find_by_item_instance_code(orderitem[0]).item_code
-     if promo.original_product.to_s == orderitem[0]
-        if promo.min_qty.to_i > orderitem[1].to_i
-          return false
-        else
-          check_promo_type(promo,orderitem, sale_id)
-        end
-     end
+    orderitem.each do |odr_item|
+       if promo.original_product.to_s == odr_item[0]
+          if promo.min_qty.to_i > odr_item[1].to_i
+            return false
+          else
+            check_promo_type(promo,odr_item, sale_id)
+          end
+       end
+    end
   end
 
   def self.check_promo_type(promo, orderitem, sale_id)
-    same, promo_product = check_giveaway_product(promo, orderitem[0])
+    promo.promotion_products.each do |promo_product|
+     if promo_product.item_code == orderitem[0]
+       same = true
+     else
+       # return false, promo_product
+       same = false
+     end
+     # same, promo_product = check_giveaway_product(promo, orderitem[0])
      if promo.promo_type == Promotion::PROMO_TYPE1
        if same
-         give_promotion_same_product(orderitem[1], promo.min_qty, promo_product.min_qty, orderitem, sale_id)
+         give_promotion_same_product(orderitem[1], promo.min_qty, promo_product.min_qty, orderitem, sale_id,promo_product.item_code)
        else
          give_promotion_second_product(orderitem[1], promo.min_qty, promo_product.item_code, orderitem, sale_id)
        end
@@ -73,19 +87,23 @@ class Promotion < ApplicationRecord
      elsif promo.promo_type == Promotion::PROMO_TYPE4
        give_promotion_discount(same,promo_product,promo.min_qty, orderitem, sale_id)
      end
+   end
   end
 
   def self.check_giveaway_product(promo, orderitem)
-    promo.promotion_products.each do |promo_product|
-      if promo_product.item_code == orderitem
-        return true, promo_product
-      else
-        return false, promo_product
-      end
-    end
+    # promo_pp = []
+    # flag = false
+    # promo.promotion_products.each do |promo_product|
+    #   if promo_product.item_code == orderitem
+    #     # return true, promo_product
+    #     promo_pp.push(promo_product)
+    #   else
+    #     # return false, promo_product
+    #   end
+    # end
   end
 
-  def self.give_promotion_same_product(qty, promoqty, foc_min_qty, orderitem, sale_id)
+  def self.give_promotion_same_product(qty, promoqty, foc_min_qty, orderitem, sale_id,promo_product)
      puts " Order qty: " + qty.to_s + " / promoqty: " + promoqty.to_s + " / giveaway: " + foc_min_qty.to_s
      multiple = qty.to_i / promoqty.to_i # loop count
      charge_qty = 0
@@ -113,7 +131,7 @@ class Promotion < ApplicationRecord
        charge_qty += qty
      end
      item = OrderItem.find_by_item_instance_code(orderitem[0])
-     if promo_product == OrderItem.find_by_item_instance_code(orderitem[0]).item_code
+     if promo_product == OrderItem.find_by_item_instance_code(orderitem[0]).item_instance_code
        item = OrderItem.find_by_item_instance_code(orderitem[0])
      else
        item = OrderItem.find_by_item_code(promo_product)
@@ -126,7 +144,6 @@ class Promotion < ApplicationRecord
                                          # AA - 10        # 3          # BB         # orderList, #S34345
   def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id)
     puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s
-    byebug
     promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty
     foc_qty = find_second_item_qty(sale_id, promo_product)
     if (foc_qty < promotion_qty)
@@ -212,9 +229,11 @@ class Promotion < ApplicationRecord
    saleObj = Sale.find_by_sale_id(sale_id)
    itemList = combine_item(saleObj)
    itemList.each do |item|
-      if item[0] == promo_item
-         return item[1]
-      end
+     item.each do |i|
+        if i[0] == promo_item
+           return i[1]
+        end
+     end
    end
    return 0
  end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 6eec518f..78596b42 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -158,6 +158,7 @@ class Sale < ApplicationRecord
 
     #pull
     sale_item.product_code = item.item_code
+    sale_item.item_instance_code = item.item_instance_code
     sale_item.product_name = item.item_name
     sale_item.product_alt_name = item.alt_name
     sale_item.account_id = item.account_id
@@ -177,7 +178,7 @@ class Sale < ApplicationRecord
     sale_item = SaleItem.new
     sale_item.product_code = chargeObj.item_code
     sale_item.product_name = dining_name.to_s + " ( " + dining_time.to_s + " )"
-    # sale_item.account_id = item.account_id
+    sale_item.account_id = 0
     sale_item.product_alt_name = "-"
     sale_item.qty = 1
     sale_item.unit_price = chargeObj.unit_price
@@ -186,7 +187,10 @@ class Sale < ApplicationRecord
     sale_item.sale_id = self.id
     sale_item.price = diningprice
     sale_item.save
-    self.compute
+
+    # Re-calc 
+    sale = Sale.find(self.id)
+    self.compute_by_sale_items(self.id, sale.sale_items, self.total_discount)
   end
 
   def update_item (item)
@@ -223,7 +227,9 @@ class Sale < ApplicationRecord
       subtotal_price = subtotal_price + item.price
       total_taxable = total_taxable + (item.taxable_price * item.qty)
     end
+
     apply_tax (total_taxable)
+
     self.total_amount = subtotal_price
     self.total_discount = total_discount
     self.grand_total = (self.total_amount - self.total_discount) + self.total_tax
@@ -291,6 +297,8 @@ class Sale < ApplicationRecord
 
   # Tax Re-Calculte
   def compute_tax(sale, total_taxable, total_discount = 0)
+    shop = Shop.first();
+
     #if tax is not apply create new record
     SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax|
       #delete existing and create new
@@ -321,7 +329,9 @@ class Sale < ApplicationRecord
             total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
           end
           #new taxable amount is standard rule for step by step
-          # total_taxable = total_taxable + sale_tax.tax_payable_amount
+          if shop.calc_tax_order
+            total_taxable = total_taxable + sale_tax.tax_payable_amount
+          end
 
           sale_tax.inclusive = tax.inclusive
           sale_tax.save
@@ -334,6 +344,8 @@ class Sale < ApplicationRecord
 
   # Tax Calculate
   def apply_tax(total_taxable)
+    shop = Shop.first();
+    
     #if tax is not apply create new record
     SaleTax.where("sale_id='#{self.sale_id}'").find_each do |existing_tax|
       #delete existing and create new
@@ -345,7 +357,7 @@ class Sale < ApplicationRecord
     tax_profiles = TaxProfile.all.order("order_by asc")
 
     customer = Customer.find(self.customer_id)
-    puts customer
+    
     #Create new tax records
     tax_profiles.each do |tax|
       customer.tax_profiles.each do |cus_tax|
@@ -367,7 +379,9 @@ class Sale < ApplicationRecord
           end
 
           #new taxable amount is standard rule for step by step
-          # total_taxable = total_taxable + sale_tax.tax_payable_amount
+          if shop.calc_tax_order
+            total_taxable = total_taxable + sale_tax.tax_payable_amount
+          end
 
           sale_tax.inclusive = tax.inclusive
           sale_tax.save
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index b8ae456d..c4aae1fa 100644
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -107,7 +107,17 @@ class SaleItem < ApplicationRecord
     return price,type
   end
 
+  # Check for Card Payment
+  def self.get_sale_payments_by_card(sale_payments)
 
+      # Check for Card Payment
+      sale_payments.each do |sp|
+        if sp.payment_method == "jcb" || sp.payment_method == "mpu" || sp.payment_method == "visa" || sp.payment_method == "master"
+          return true;
+        end
+      end
+      
+  end
   # def self.get_overall_discount(sale_id)
   #   price = 0.0
   #   item=SaleItem.where("product_code=?", sale_id)
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 4719e546..5f97bcfc 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -263,6 +263,8 @@ class SalePayment < ApplicationRecord
   end
 
   def sale_update_payment_status(paid_amount)
+    puts paid_amount
+    puts "parid Masssssssssssssssssssssssssssssssssssssssss"
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
     self.sale.save!
diff --git a/app/models/stock_check.rb b/app/models/stock_check.rb
index 7a8f8d65..c2499c29 100644
--- a/app/models/stock_check.rb
+++ b/app/models/stock_check.rb
@@ -1,17 +1,16 @@
 class StockCheck < ApplicationRecord
-
   has_many :stock_check_items
 
-  def create(user, eason, item_list)
+  def create(user, reason, item_list)
     self.reason = reason
     self.check_by = user.id
     self.check_start = Time.now
     self.check_end = Time.now
-    self.save
+    save
     item_list.each do |item|
       stockItem = StockCheckItem.new
-      stockItem.create(self.id,item)
+      stockItem.create(id, item)
     end
-    return self
+    self
   end
 end
diff --git a/app/models/stock_check_item.rb b/app/models/stock_check_item.rb
index e02972a6..8653837c 100644
--- a/app/models/stock_check_item.rb
+++ b/app/models/stock_check_item.rb
@@ -1,5 +1,4 @@
 class StockCheckItem < ApplicationRecord
-  
   belongs_to :stock_check
 
   def create(stock_id, item)
@@ -33,4 +32,15 @@ class StockCheckItem < ApplicationRecord
         return 'missing stock', stock_check_qty.to_i - journal_balance.to_i
       end
   end
+
+  def self.get_transaction(from, to, item_code)
+    transaction = all
+    if !from.nil? && !to.nil?
+      transaction = transaction.where('created_at between ? and ?', from, to)
+    end
+    if item_code.present?
+      transaction = transaction.where(item_code: item_code)
+    end
+    transaction
+  end
 end
diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb
index 489fb0ae..ef615a9c 100644
--- a/app/pdf/stock_result_pdf.rb
+++ b/app/pdf/stock_result_pdf.rb
@@ -1,8 +1,8 @@
 class StockResultPdf < Prawn::Document
-  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
+  attr_accessor :label_width, :price_column_width, :page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size, :item_height, :qty_width, :total_width, :item_description_width, :text_width
 
-  def initialize(printer_settings,stockcheck, stockcheck_items,checker_name, shop_details)
-    self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
+  def initialize(printer_settings, stockcheck, stockcheck_items, checker_name, shop_details)
+    self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
     self.margin = 5
     self.price_width = 40
@@ -27,66 +27,68 @@ class StockResultPdf < Prawn::Document
     self.header_font_size = 10
     self.item_font_size = 8
 
-    header( shop_details)
+    header(shop_details)
 
     stroke_horizontal_rule
 
-    detail(stockcheck,stockcheck_items, checker_name)
+    detail(stockcheck, stockcheck_items, checker_name)
   end
 
   def header (shop_details)
     move_down 7
-    text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
+    text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size, :align => :center
     move_down 5
-    text "#{shop_details.address}", :size => self.item_font_size,:align => :center
+    text "#{shop_details.address}", :size => self.item_font_size, :align => :center
     # move_down self.item_height
     move_down 5
-    text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
+    text "#{shop_details.phone_no}", :size => self.item_font_size, :align => :center
     move_down 5
 
     stroke_horizontal_rule
   end
 
   def detail(stockcheck, stockcheck_items, checker_name)
-        move_down 7
-         y_position = cursor
-        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
-            text "Checker : ", :size => self.item_font_size,:align => :left
-        end
-        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{checker_name}" , :size => self.item_font_size,:align => :left
-        end
+    move_down 7
+    y_position = cursor
+    bounding_box([0, y_position], :width => self.label_width, :height => self.item_height) do
+      text "Checker : ", :size => self.item_font_size, :align => :left
+    end
+    bounding_box([self.label_width, y_position], :width => self.label_width, :height => self.item_height) do
+      text "#{checker_name}", :size => self.item_font_size, :align => :left
+    end
 
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
-            text "Check Start Time : ", :size => self.item_font_size,:align => :left
-        end
-        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ stockcheck.check_start.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left
-        end
+    y_position = cursor
+    bounding_box([0, y_position], :width => self.label_width, :height => self.item_height) do
+      text "Check Start Time : ", :size => self.item_font_size, :align => :left
+    end
+    bounding_box([self.label_width, y_position], :width => self.label_width, :height => self.item_height) do
+      text "#{ stockcheck.check_start.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }", :size => self.item_font_size, :align => :left
+    end
 
-        y_position = cursor
-        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
-            text "Check End Time ", :size => self.item_font_size,:align => :left
-        end
-        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ stockcheck.check_start.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left
-        end
+    y_position = cursor
+    bounding_box([0, y_position], :width => self.label_width, :height => self.item_height) do
+      text "Check End Time ", :size => self.item_font_size, :align => :left
+    end
+    bounding_box([self.label_width, y_position], :width => self.label_width, :height => self.item_height) do
+      text "#{ stockcheck.check_start.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }", :size => self.item_font_size, :align => :left
+    end
 
-        if stockcheck_items.length > 0
-            stockcheck_items.each do |st|
-                move_down 5
-                y_position = cursor
-
-                bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
-                    text "#{ st.item_code }", :size => self.item_font_size,:align => :left
-                end
-                bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                    text  "#{st.stock_count.to_i}" , :size => self.item_font_size,:align => :right
-                end
-            end
-        end
+    if stockcheck_items.length > 0
+      stockcheck_items.each do |st|
         move_down 5
-        stroke_horizontal_rule
+        y_position = cursor
+
+        item_name = MenuItemInstance.get_item_name(st.item_code)
+
+        bounding_box([0, y_position], :width => self.item_description_width, :height => self.item_height) do
+          text item_name.to_s, :size => self.item_font_size, :align => :left
+        end
+        bounding_box([self.item_description_width, y_position], :width => self.label_width) do
+          text "#{st.stock_count.to_i}", :size => self.item_font_size, :align => :right
+        end
+      end
+    end
+    move_down 5
+    stroke_horizontal_rule
   end
 end
diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
index 66cebece..94b29837 100644
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -92,9 +92,9 @@ json.options opt_format
 json.instances item.menu_item_instances do |is|
   # Convert id to name for attributes
   instance_attr = []
-  is.item_attributes do |ia|
-    mItemAttr = MenuItemAttribute.find(is)
-    instance_attr.push(ia.name)
+  is.item_attributes.each do |ia|
+    # mItemAttr = MenuItemAttribute.find(is)
+    instance_attr.push(ia)
   end
   
     json.id is.id
diff --git a/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder b/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder
new file mode 100644
index 00000000..e158f807
--- /dev/null
+++ b/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder
@@ -0,0 +1,8 @@
+if(@attribute)
+  json.id @attribute.id
+  json.type @attribute.attribute_type
+  json.name @attribute.name
+  json.value @attribute.value
+else
+  json.success false
+end
\ No newline at end of file
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index fa61114f..0883cc92 100644
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -1,20 +1,3 @@
-<div class="row">
-  <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
-
-    <% if current_login_employee.role = "admin" %>
-
-    <% elsif current_login_employee.role = "cashier" %>
-        <%= link_to "Cashier Station", origami_path %>
-    <% elsif current_login_employee = "account" %>
-        <%= link_to "Cashier Station", oishi_path %>
-    <% else %>
-        <%= link_to "Cashier Station", oishi_path %>
-    <% end %>
-    <% shop = Shop.first %>
-
-  </div>
-</div>
-
 <div class="row">
   <div class="col-md-9 col-lg-9">
       <h4><strong>Role Features</strong></h4>
@@ -205,14 +188,14 @@
   <div class="card">
     <div class="page-header center-text">
      <h4 class="footer-header">
-      <%= shop.name %>
+      <%= @shop.name %>
      </h4>
     </div>
     <div class="center-text">
-      <%= shop.address %>
+      <%= @shop.address %>
     </div>
     <div class="center-text">
-      <%= shop.phone_no %>
+      <%= @shop.phone_no %>
     </div>
   </div>
 </div>
diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb
index 115c80c5..7869bc10 100644
--- a/app/views/inventory/inventory/_inventory_list.html.erb
+++ b/app/views/inventory/inventory/_inventory_list.html.erb
@@ -22,11 +22,19 @@
       %>
         <tr>
           <td><%= count %></td>
-          <td><%= item.item_code rescue ""%></td>
+          <td>
+            <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+            <% if menu_item.nil? %>
+                <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+            <% else %>
+                <%= menu_item.menu_item.name rescue "-" %>
+                - <%= menu_item.item_instance_name rescue "-" %>
+            <% end %>
+          </td>
           <td><%= item.min_order_level %></td>
           <td><%= item.max_stock_level %></td>
-          <td><%= item.created_by%></td>
-          <td><%= item.created_at%></td>
+          <td><%= Employee.find(item.created_by).name rescue '-' %></td>
+          <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
         </tr>
       <% end %>
     </table>
diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb
index 7aeb4464..07d6f253 100644
--- a/app/views/inventory/inventory/index.html.erb
+++ b/app/views/inventory/inventory/index.html.erb
@@ -1,22 +1,27 @@
-
- <div class="row">
+<div class="row">
   <div class="col-lg-10 col-md-10 col-sm-10">
-      <%= render 'inventory_list' %>
+    <%= render 'inventory_list' %>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
-       <button id="back" type="button" class="btn btn-block btn-primary"> Back </button>
-    <%end%>
-    <button id="stock_taking" type="button" class="btn btn-block btn-primary"> New Stock Taking </button>
+    <% if current_login_employee.role == "administrator" || current_login_employee.role == 'manager' %>
+        <button id="back" type="button" class="btn btn-block btn-primary"> Back</button>
+    <% end %>
+    <button id="stock_taking" type="button" class="btn btn-block btn-primary"> New Stock Taking</button>
     <button id="stock_check_report" type="button" class="btn btn-block btn-primary"> Stock Check Report</button>
   </div>
 </div>
 
 <script>
-$('#stock_taking').on('click',function(){
-  window.location.href = '/inventory/stock_checks';
-})
-$('#stock_check_report').on('click', function(){
-  window.location.href = '';
-})
+    $('#stock_taking').on('click', function () {
+        window.location.href = '<%= inventory_stock_checks_path %>';
+    });
+
+    $('#stock_check_report').on('click', function () {
+        window.location.href = '<%= reports_stock_check_index_path %>';
+    });
+
+    $('#back').on('click', function () {
+        window.location.href = '<%= dashboard_path %>';
+    });
+
 </script>
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 36b80822..31a1a9a2 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -1,15 +1,84 @@
+<%= simple_form_for([:inventory, @inventory_definition]) do |f| %>
+    <%= f.error_notification %>
 
-<%= simple_form_for([:inventory,@inventory_definition]) do |f| %>
-  <%= f.error_notification %>
+    <div class="form-inputs">
+      <div class="row">
+        <% arr = MenuItem.active.order("name desc").pluck(:name, :item_code) %>
+        <% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
+            <% arr.push(p) %>
+        <% end %>
+        <div class="col-md-3">
+          <label class="control-label"><abbr title="required">*</abbr> Item</label>
+          <select class="form-control item_code_place" id="item">
+            <% if !@inventory_definition.item_code.nil? %>
+                <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
+                <% if menuiteminstance.nil? %>
+                    <% code = @inventory_definition.item_code %>
+                <% else %>
+                    <% code = menuiteminstance.menu_item.item_code %>
+                <% end %>
+            <% end %>
+            <option value=""></option>
+            <% arr.each do |a| %>
+                <% if a[1] == code %>
+                    <option value="<%= a[1] %>" selected><%= a[0] %></option>
+                <% else %>
+                    <option value="<%= a[1] %>"><%= a[0] %></option>
+                <% end %>
+            <% end %>
+          </select>
+        </div>
 
-  <div class="form-inputs">
-    <%= f.input :item_code %>
-    <%= f.input :min_order_level %>
-    <%= f.input :max_stock_level %>
-  </div>
+        <% sample = [] %>
+        <% if @inventory_definition.item_code.nil? %>
+            <% if !MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code).nil? %>
+                <% sample = MenuItemInstance.where("item_instance_code=?", @inventory_definition.item_code).pluck(:item_instance_name, :item_instance_code) %>
+            <% else %>
+                <% sample = Product.where("item_code=?", @inventory_definition.item_code).pluck(:name, :item_code) %>
+            <% end %>
+        <% end %>
+        <div class="col-md-3"><%= f.input :item_code, collection: sample %></div>
+      </div>
 
-  <div class="form-actions">
-    <%= f.button :submit %>
-  </div>
+      <%= f.input :min_order_level %>
+      <%= f.input :max_stock_level %>
+    </div>
+
+    <div class="form-actions">
+      <%= link_to 'Back', inventory_path, class: 'btn btn-success' %>
+      <%= f.button :submit, class: 'btn btn-primary' %>
+    </div>
 
 <% end %>
+
+<script>
+
+    $(document).ready(function () {
+        $(".item_code_place").select2({
+            placeholder: 'Select Item'
+        });
+        $("select#inventory_definition_item_code").select2();
+
+        $(".item_code_place").on('change', function (event) {
+            var ajax_url = "<%= settings_find_item_instance_path	 %>";
+            var item_code = this.value;
+            $.ajax({
+                type: "GET",
+                url: ajax_url,
+                data: 'item_code=' + item_code,
+                success: function (result) {
+                    $("#inventory_definition_item_code").empty();
+                    var itemlist;
+                    for (var i = 0; i < result.length; i++) {
+                        itemlist = "<option value ='" + result[i][1] + "'>" + result[i][0] + "</option>";
+                        $("select#inventory_definition_item_code").append(itemlist);
+                    }
+//                    $("select#inventory_definition_item_code").append(itemlist);
+                    $("select#inventory_definition_item_code").select2();
+                }
+            });
+        });
+
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/views/inventory/inventory_definitions/edit.html.erb b/app/views/inventory/inventory_definitions/edit.html.erb
index 80ce29e1..b6d6a7bb 100644
--- a/app/views/inventory/inventory_definitions/edit.html.erb
+++ b/app/views/inventory/inventory_definitions/edit.html.erb
@@ -1,6 +1,10 @@
-<h1>Editing Inventory Definition</h1>
-
-<%= render 'form', inventory_definition: @inventory_definition %>
-
-<%= link_to 'Show', @inventory_definition %> |
-<%= link_to 'Back', inventory_definitions_path %>
+<div class="span12">
+  <div class="page-header">
+    <ul class="breadcrumb">
+      <li><a href="<%= root_path %>">Home</a></li>
+      <li><a href="<%= inventory_path %>">Product Inventory</a></li>
+      <li>Edit</li>
+    </ul>
+  </div>
+  <%= render 'form', inventory: @inventory_definition %>
+</div>
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index 812d4409..69af59a4 100644
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -7,17 +7,29 @@
     </div>
     <div class="row">
       <div class="col-md-12">
-       <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''></input>
-     </div>
+        <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''/>
+      </div>
     </div>
     <br>
     <div class="row">
       <div class="col-md-2"></div>
       <div class="col-md-2">
-        Product
+        Item
       </div>
       <div class="col-md-7">
-        <input type='text' class='form-control' placeholder="Product Name" id='product_sku' value=''></input>
+        <select class='form-control' id='product_sku'>
+          <option value="">Select Product</option>
+          <% @inventory_definitions.each do |id| %>
+              <option value="<%= id.item_code %>">
+                <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                <% if menu_item.nil? %>
+                    <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                <% else %>
+                    <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                <% end %>
+              </option>
+          <% end %>
+        </select>
       </div>
     </div>
     <br>
@@ -27,14 +39,14 @@
         Qty
       </div>
       <div class="col-md-7">
-        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''></input>
+        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''/>
       </div>
     </div>
     <br>
     <div class="row">
       <div class="col-md-4"></div>
       <div class="col-md-7">
-        <button class="btn btn-primary form-control" id='save_to_stock_check'> Save </button>
+        <button class="btn btn-primary form-control" id='save_to_stock_check'> Save</button>
       </div>
     </div>
   </div>
@@ -44,9 +56,10 @@
       <div class="col-md-12">
         <table class="table table-striped" id='stock_item'>
           <tr>
-            <th>#</th>
+            <!--<th>#</th>-->
             <th>Product</th>
             <th>Balance</th>
+            <th></th>
           </tr>
         </table>
       </div>
@@ -54,49 +67,69 @@
   </div>
   <div class="col-md-1">
     <div class="row">
-      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish </button>
+      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='back'> Back</button>
+      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button>
     </div>
   </div>
 </div>
 
 <script>
-  var count = 0
+    $(document).ready(function () {
+        $('#product_sku').select2({
+            allowClear: true,
+            placeholder: 'Select Product'
+        })
+    });
 
-  $('#save_to_stock_check').on('click', function(){
-      count += 1;
-      product_sku = $('#product_sku').val();
-      product_qty = $('#product_qty').val();
-      var tr = '<tr>'
-             + '<td>'+ count +'</td>'
-             + '<td><input type=text value="'+ product_sku +'" id="item_sku_'+ count +'" name='+count+'></input></td>'
-             + '<td><input type=text value="'+ product_qty +'" id="item_qty_'+ count +'" name='+count+'></input></td>'
-             + '</tr>'
-        $('#stock_item').append(tr)
-        $('#product_sku').val('');
+    var count = 0;
+
+    $('#save_to_stock_check').on('click', function () {
+        count += 1;
+        product_sku = $('#product_sku').val();
+        product_qty = $('#product_qty').val();
+        product_name = $("#product_sku").find("option:selected").text();
+        var tr = '<tr>'
+            //+ '<td>' + count + '</td>'
+            + '<td><input type=hidden value="' + product_sku + '" id="item_sku_' + count + '" name=' + count + '/>'
+            + product_name + '</td>'
+            + '<td><input type=text value="' + product_qty + '" id="item_qty_' + count + '" name=' + count + '/></td>'
+            + '<td><input type=button value="X" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
+            + '</tr>';
+        $('#stock_item').append(tr);
+//        $('#product_sku').val('');
         $('#product_qty').val('');
-  })
+    });
 
-  $('#finish').on('click',function(){
-    var reason = $('#stock_check_reason').val();
-    var arr = [];
-    var jsonStr = ''
+    $('#finish').on('click', function () {
+        var reason = $('#stock_check_reason').val();
+        var arr = [];
+        var jsonStr = '';
 
-    for(var i = 1; i <= count; i++){
-      itemname = $('#item_sku_'+i ).val();
-      itemqty = $('#item_qty_'+i ).val();
-      arr.push({sku:itemname, qty:itemqty})
-		  jsonStr = JSON.stringify(arr)
+        for (var i = 1; i <= count; i++) {
+            itemname = $('#item_sku_' + i).val();
+            itemqty = $('#item_qty_' + i).val();
+            if(itemname !== undefined){
+                arr.push({sku: itemname, qty: itemqty});
+            }
+            jsonStr = JSON.stringify(arr);
+        }
+        console.log(jsonStr);
+        $.ajax({
+            type: 'Post',
+            url: '<%= inventory_stock_check_save_path %>',
+            data: 'stock_item=' + jsonStr + '&reason=' + reason,
+            success: function (data) {
+                window.location.href = '/inventory/stock_checks/' + data['stock_id'];
+            }
+        })
+    });
+
+    $('#back').on('click', function () {
+        window.location.href = '/inventory';
+    });
+
+    function remove_row(row) {
+        $("#item_remove_"+row).parent().parent().remove();
     }
-    console.log(jsonStr)
-    $.ajax({
-      type: 'Post',
-      url: '<%= inventory_stock_check_save_path %>',
-      data:'stock_item='+ jsonStr + '&reason='+ reason,
-      success:function(data){
-         alert(data['stock_id'])
-         window.location.href = '/inventory/stock_checks/'+ data['stock_id'];
-      }
-    })
-  })
 
 </script>
diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb
index 4d0e83d0..f4af6db0 100644
--- a/app/views/inventory/stock_checks/show.html.erb
+++ b/app/views/inventory/stock_checks/show.html.erb
@@ -3,81 +3,96 @@
   <div class="col-md-10">
     <div class="row">
       <div class="col-md-2">
-          Check by
+        Check by
       </div>
       <div class="col-md-8">
-        <%= @check.check_by %>
+        <%= Employee.find(@check.check_by).name rescue '' %>
       </div>
     </div>
     <div class="row">
       <div class="col-md-2">
-          Check At
+        Check At
       </div>
       <div class="col-md-8">
-        <%= @check.created_at %></div>
+        <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></div>
     </div>
     <div class="row">
       <div class="col-md-2">
-          Reason
+        Reason
       </div>
       <div class="col-md-8">
-          <%= @check.reason %>
+        <%= @check.reason %>
       </div>
     </div>
     <br>
     <div class="row">
-    <table class="table table-striped col-md-12">
-      <tr>
-        <th>#</th>
-        <th>Product</th>
-        <th>Stock Count</th>
-        <th>Stock Balance</th>
-        <th>Different</th>
-        <th>Remark</th>
-      </tr>
-      <%
-      count = 0
-      @check.stock_check_items.each do |item|
-      count += 1
-      %>
+      <table class="table table-striped col-md-12">
         <tr>
-          <td><%= count %></td>
-          <td><%= item.item_code %></td>
-          <td><%= item.stock_count %></td>
-          <td><%= item.stock_balance %></td>
-          <td><%= item.different %></td>
-          <td><%= item.remark %></td>
+          <th>#</th>
+          <th>Product</th>
+          <th>Stock Count</th>
+          <th>Stock Balance</th>
+          <th>Different</th>
+          <th>Remark</th>
         </tr>
-      <% end %>
-    </table>
+        <%
+          count = 0
+          @check.stock_check_items.each do |item|
+            count += 1
+        %>
+            <tr>
+              <td><%= count %></td>
+              <td>
+                <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+                <% if menu_item.nil? %>
+                    <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+                <% else %>
+                    <%= menu_item.menu_item.name rescue "-" %>
+                    - <%= menu_item.item_instance_name rescue "-" %>
+                <% end %>
+              </td>
+              <td><%= item.stock_count %></td>
+              <td><%= item.stock_balance %></td>
+              <td><%= item.different %></td>
+              <td><%= item.remark %></td>
+            </tr>
+        <% end %>
+      </table>
+    </div>
   </div>
-</div>
   <div class="col-md-2">
-      <button id="back" type="button" class="btn btn-block btn-primary"> Back </button>
-      <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal </button>
-      <button id="print" type="button" class="btn btn-block btn-primary"> Print </button>
+    <button id="back" type="button" class="btn btn-block btn-primary"> Back</button>
+    <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal</button>
+    <button id="print" type="button" class="btn btn-block btn-primary"> Print</button>
   </div>
 </div>
 
 <script>
-$('#save_to_journal').on('click', function(){
-   check_id = $('#stock_check_id').val();
-   $.ajax({
-     type: 'post',
-     url: '<%= inventory_save_to_journal_path %>',
-     data: 'data='+ check_id,
-     success: function(){
-        alert('success')
-     }
-   })
-})
 
-$('#print').on('click',function(){
-  check_id = $('#stock_check_id').val();
-  $.ajax({
-    type: 'post',
-    url: '<%= inventory_print_stock_check_path %>',
-    data: 'stock_check_id='+ check_id
-  })
-})
+    $('#save_to_journal').on('click', function () {
+        check_id = $('#stock_check_id').val();
+        $.ajax({
+            type: 'post',
+            url: '<%= inventory_save_to_journal_path %>',
+            data: 'data=' + check_id,
+            success: function () {
+                alert('Successfully saved to journal.');
+                window.location.href = '/inventory';
+            }
+        })
+    });
+
+    $('#print').on('click', function () {
+        check_id = $('#stock_check_id').val();
+        $.ajax({
+            type: 'post',
+            url: '<%= inventory_print_stock_check_path %>',
+            data: 'stock_check_id=' + check_id
+        })
+    });
+
+    $('#back').on('click', function () {
+        window.location.href = '/inventory';
+    });
+
 </script>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 47ab23d2..328437ca 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -56,6 +56,7 @@
             <li><%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Commission Report", reports_commission_index_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Stock Check Report", reports_stock_check_index_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
         <li class="navbar-nav mr-auto">
diff --git a/app/views/layouts/_header_inventory.html.erb b/app/views/layouts/_header_inventory.html.erb
new file mode 100644
index 00000000..17a8e764
--- /dev/null
+++ b/app/views/layouts/_header_inventory.html.erb
@@ -0,0 +1,38 @@
+<div class="container-fluid" style="min-height:30px; padding-left:0px !important; padding-right:0px !important; background:#54A5AF; margin-bottom:5px">
+  <div style="padding-top:5px;padding-bottom:5px;margin-left:15px; margin-right:15px;">
+    <div style="float:left;margin-top:3px;text-align:left;color:#ffffff">
+      <strong>Inventory - <span id="clockbox"></span></strong>
+    </div>
+    <div style="float:right; margin-top:3px; text-align:right;width:200px;color:#ffffff">
+      <% if current_login_employee %>
+          <%= current_login_employee.name %>  | <%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
+      <% end %>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+    tday=new Array("Sun","Mon","Tue","Wed","Thu","Fri","Sat");
+    tmonth=new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
+
+    function GetClock(){
+        var d=new Date();
+        var nday=d.getDay(),nmonth=d.getMonth(),ndate=d.getDate(),nyear=d.getFullYear();
+        var nhour=d.getHours(),nmin=d.getMinutes(),nsec=d.getSeconds(),ap;
+
+        if(nhour==0){ap=" AM";nhour=12;}
+        else if(nhour<12){ap=" AM";}
+        else if(nhour==12){ap=" PM";}
+        else if(nhour>12){ap=" PM";nhour-=12;}
+
+        if(nmin<=9) nmin="0"+nmin;
+        if(nsec<=9) nsec="0"+nsec;
+
+        document.getElementById('clockbox').innerHTML=""+tday[nday]+", "+tmonth[nmonth]+" "+ndate+", "+nyear+" "+nhour+":"+nmin+":"+nsec+ap+"";
+    }
+
+    window.onload=function(){
+        GetClock();
+        setInterval(GetClock,1000);
+    }
+</script>
+<div id="clockbox"></div>
diff --git a/app/views/layouts/inventory.html.erb b/app/views/layouts/inventory.html.erb
index d6bbf436..8982d546 100644
--- a/app/views/layouts/inventory.html.erb
+++ b/app/views/layouts/inventory.html.erb
@@ -9,14 +9,14 @@
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
 
-    <%= stylesheet_link_tag    'origami', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'inventory_definitions', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
      <%= stylesheet_link_tag    'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>
   </head>
 
   <body>
-    <%= render 'layouts/header_orgiami' %>
+    <%= render 'layouts/header_inventory' %>
     <div class="container-fluid">
       <% flash.each do |type, message| %>
         <% if !flash["errors"]%>
diff --git a/app/views/oqs/_oqs_test.html.erb b/app/views/oqs/_oqs_test.html.erb
new file mode 100644
index 00000000..32b749ad
--- /dev/null
+++ b/app/views/oqs/_oqs_test.html.erb
@@ -0,0 +1,51 @@
+<% order.each do |qid|%>
+<p class="hidden"><%=qid.order_queue_station_id%></p>
+	<div class="card queue_station">
+		<div class="card-block">
+			<h4 class="card-title">
+				<span class="order-zone-type"><%= qid.table_type %> - </span>
+				<span class="order-zone"><%= qid.zone %></span>
+				<small class="pull-right"><%= qid.order_id %></small>
+			</h4> 
+			<h4>
+				<span class="order-item">
+					<%= qid.item_name %>
+				</span> [x
+				<span class="order-qty">
+					<%= qid.qty %>
+				</span> ]   
+			</h4>                  
+
+			<p class="card-text item-options">
+				<%= qid.options == "[]"? "" : qid.options %>
+			</p> 
+
+			<p class="card-text">
+				<small class="text-muted">Order at 
+					<span class="order-at">
+						<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
+					</span> - 
+					<span class="order-by">
+						<%= qid.item_order_by %>
+					</span> 
+				</small>
+			</p>
+			<p class="hidden order-customer"><%= qid.customer_name %></p>
+            <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
+            <div class="card-footer">
+	            <button id="edit_<%= qid.assigned_order_item_id %>" class="btn btn-warning order-item order-item-edit">EDIT</button>
+	             <button id="assigned_queue_<%= qid.assigned_order_item_id %>" class="btn btn-primary order-item order-complete">COMPLETE</button>
+	        </div>   
+		</div>
+	</div> 
+<%end%>  
+<style type="text/css">
+	.order-completed {
+  background-color: #CCFFDD;
+}
+.order-item {
+	width: 49%;
+	font-size: 18px;
+	margin: 0px 0px 5px 0px;	
+}
+</style>
\ No newline at end of file
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 824618e6..468cd58b 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,58 +1,60 @@
-<br>
-<div class="row">
-  <div class="col-md-6">
-  <%= form_tag oqs_root_path, :method => :get do %>
-    <div class="form-group col-md-8">
-     <input type="text" name="filter" class="form-control input-md" placeholder="">
-    </div>
 
-    <div class="form-group col-md-1">
-     <input type="submit" value="Search" class='btn btn-primary btn-md'>
-    </div>
-
-  <% end %>
-  </div>
-</div>  
 <hr>
 <!-- Column One -->
 <div class="row">
-  <div class="col-lg-8 col-md-8 col-sm-8">    
+  <div class="col-lg-8 col-md-8 col-sm-8">
+   <div class="row">
+    <div class="col-md-12">
+      <%= form_tag oqs_root_path, :method => :get do %>
+    <div class="form-group col-md-6">
+     <input type="text" name="filter" class="form-control input-md" placeholder="">
+    </div>
+
+    <div class="form-group col-md-6">
+     <input type="submit" value="Search" class='btn btn-primary btn-md'>
+    </div>
+    <% end %>
+    </div>
+   </div>     
     <!-- Nav tabs -->
     <ul class="nav nav-tabs" role="tablist">
       <!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
         <a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
       </li> -->
       <li class="nav-item nav-completed">
-        <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
+        <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
       </li>
 
       <% # For Tab Disable for Station is inactive
         status=""
+        i=0
         @queue_stations.each do |qsi|  
           if qsi.is_active == false   
             status="disabled"    
           end %>
-      <li class="nav-item oqs_click" >
-          <p class="hidden oqs-id"><%= qsi.id  %></p>
-          <a class="nav-link" data-toggle="tab" href="" role="tab" <%= status %>>
-            <%= qsi.station_name %>
-            <% if @filter.nil? %>
-              <span class="badge badge-pill badge-default" id=""> <%= qsi.assigned_order_items.where("delivery_status=0").count %>                
-              </span> 
-            <%else%>
-              <span class="badge badge-pill badge-default" id=""> 
-               <% @count.each do |c|%>    
-                <% if qsi.id == c.station_id %>
-                  <%= c.total %>                
-                <%end %>  
-               <%end %>    
-              </span>
-            <%end%>
-            <% if qsi.auto_print %>
-              <span>(ap)</span>
-            <% end %>  
-          </a>
-      </li>
+            <li class="nav-item oqs_click" data-id="<%= qsi.id %>">
+                <p class="hidden oqs-id"><%= qsi.id  %></p>
+                <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
+                  <%= qsi.station_name %>
+                  <% if @filter.nil? %>
+                    <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
+                    </span> 
+                  <%else%>
+                    <span class="badge badge-pill badge-default" data-id="<%= qsi.id  %>"> 
+                     <% @count.each do |c|%>    
+                      <% if qsi.id == c.station_id %>
+                        <%= c.total %>                
+                      <%end %>  
+                     <%end %>    
+                    </span>
+                  <%end%>
+                  <% if qsi.auto_print %>
+                    <span>(ap)</span>
+                  <% end %>  
+                </a>
+            </li>
+            <% i+=1%>
+
       <% end %>      
     </ul>
     <!-- Nav tabs - End -->
@@ -107,9 +109,8 @@
 
 
       <!-- End Panel 0 - Completed -->
-
         <!--- Order Items -->
-        <div class="card-columns oqs_append" style="padding-top:10px; column-gap: 1.2rem;">       
+        <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
         </div>
          <!--- end of Items-->
     </div>
diff --git a/app/views/origami/addorders/_menu_item.json.jbuilder b/app/views/origami/addorders/_menu_item.json.jbuilder
new file mode 100644
index 00000000..32451524
--- /dev/null
+++ b/app/views/origami/addorders/_menu_item.json.jbuilder
@@ -0,0 +1,117 @@
+# Format for attributes json
+attr_format = []
+# Format for attributes json 
+if item.item_attributes.count > 0   
+  item.item_attributes.each do|attr_id|      
+    menu_attr = MenuItemAttribute.find(attr_id)
+    if attr_format.count == 0
+      attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] })
+      next
+    end
+
+    attr_format.each do |af|
+      if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]}
+        if menu_attr.attribute_type == af[:type]
+          af[:values].push(menu_attr.name)
+        end
+      else 
+        new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] }
+        attr_format.push(new_attr) 
+        break      
+      end          
+    end
+  end
+end
+
+# Format for option json
+opt_format = []
+# Format for attributes json 
+if item.item_options.count > 0   
+  item.item_options.each do|opt|      
+    menu_opt = MenuItemOption.find(opt)
+    if opt_format.count == 0
+      opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
+      next
+    end
+
+    opt_format.each do |of|
+      if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
+        if menu_opt.option_type == of[:type]
+          of[:values].push(menu_opt.name)
+        end
+      else 
+        new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
+        opt_format.push(new_opt) 
+        break
+      end
+    end         
+  end
+end
+
+#Menu Item Information
+json.id           item.id
+json.code    item.item_code
+json.name         item.name
+json.alt_name     item.alt_name
+json.image        item.image_path.url
+json.description  item.description
+json.information  item.information
+json.type         item.type
+json.account_id   item.account_id
+json.min_qty      item.min_qty
+json.is_available item.is_available
+json.is_sub_item  item.is_sub_item
+json.unit         item.unit
+
+# Item Sets of Menu Item 
+json.item_sets item.item_sets do |its|
+  json.id                 its.id
+  json.name               its.name
+  json.alt_name           its.alt_name
+  json.min_selectable_qty its.min_selectable_qty
+  json.max_selectable_qty its.max_selectable_qty
+  json.instances its.menu_item_instances do |i|
+    json.id  i.id
+  end
+end 
+
+json.attributes attr_format
+json.options opt_format
+# json.min_selectable_item item.min_selectable_item
+# json.max_selectable_item item.max_selectable_item
+
+#Item instance
+# if item.menu_item_instances.count == 1 then
+#   item_instance = item.menu_item_instances[0]
+#   json.price = item_instance.price
+#   json.is_available = item_instance.is_available
+#   json.is_on_promotion = item_instance.is_on_promotion
+#   json.promotion_price = item_instance.promotion_price
+#   json.item_attributes = item_instance.item_attributes
+
+json.instances item.menu_item_instances do |is|
+  # Convert id to name for attributes
+  instance_attr = []
+  is.item_attributes.each do |ia|
+     mItemAttr = MenuItemAttribute.find(ia).name
+    instance_attr.push(mItemAttr)
+  end
+  
+    json.id is.id
+    json.code is.item_instance_code
+    json.name is.item_instance_name
+    json.price is.price
+    json.is_available is.is_available
+    json.is_default is.is_default
+    json.is_on_promotion is.is_on_promotion
+    json.promotion_price is.promotion_price
+    json.values instance_attr
+    # json.item_sets is.item_sets
+end
+
+#Child Menu items
+# if (item.children) then
+#   json.set_items item.children.each do |item|
+#     json.partial! 'api/restaurant/menu/menu_item', item: item
+#   end
+# end
\ No newline at end of file
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 67c5c134..34920a1d 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -4,7 +4,7 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
           <% @menu.each do |menu| %>
-          <li class="nav-item menu_category" data-ref="<%= api_restaurant_menu_category_path menu.id%>">
+          <li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
             <p class="hidden menu-id"><%= menu.id  %></p> 
             <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
 
@@ -19,9 +19,11 @@
     </div>
 
     <div class="col-md-3 col-lg-3 col-sm-3">
+
+        <button type="button" class="btn btn-primary btn-md pull-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br><br>
         <div class="card-header">
           <div>
-             <strong id="order-title">ORDER DETAILS </strong> |  Table <%=@table_id%>
+             <strong id="order-title">ORDER DETAILS </strong> |  Table <%=@table.name%>
              <p class="hidden" id="table_id"><%=@table_id%></p>
              <p class="hidden" id="table_type"><%=@table.type%></p>
              <p class="hidden" id="booking_id"><%=@booking_id%></p>
@@ -106,12 +108,26 @@
             <div class="modal-body">
                 <div class="row no-set-item">
                   <div class="col-md-5">
-                      <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
-                      <br><br>
-                      <div class="form-group">
-                        <label class="col-md-6" style="margin-top:5px">Quantity</label>
-                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="change_qty" value="" min="1" max="100">
-                      </div> 
+                      <p style="text-align: center;" id="modal_box_img"></p>
+                
+                      
+                        <!-- <label class="col-md-6" style="margin-top:5px">Quantity</label>
+                        <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="change_qty" value="" min="1" max="100"> -->
+                       
+                        <div class="input-group">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-danger btn-number"  value="-" id="minus">
+                                <span class="glyphicon glyphicon-minus"></span>
+                              </button>
+                          </span>
+                          <input type="text" value="1" id="count" class="change_qty form-control col-md-12 ">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-success btn-number" value="+" id="plus">
+                                  <span class="glyphicon glyphicon-plus"></span>
+                              </button>
+                          </span>
+                      </div>
+                      
                         <p class="hidden" id="unit_price"></p>
                         <p class="hidden" id="instance_code"></p>
                         <p class="hidden" id="instance_name"></p>
@@ -155,10 +171,25 @@
                 <div class="row set-item">
                   <div class="col-md-4">
                   <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
-                      <div class="form-group">
+                      <!-- <div class="form-group">
                         <label class="col-md-6" style="margin-top:5px">Quantity</label>
                         <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">
-                      </div> 
+                      </div>  -->
+
+                      <div class="input-group">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-danger btn-number"  value="-" id="set_minus">
+                                <span class="glyphicon glyphicon-minus"></span>
+                              </button>
+                          </span>
+                          <input type="text" value="1" id="set_count" class="set_change_qty form-control col-md-12 ">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
+                                  <span class="glyphicon glyphicon-plus"></span>
+                              </button>
+                          </span>
+                      </div>
+
                         <p class="hidden" id="set_unit_price"></p>
                         <p class="hidden" id="set_instance_code"></p>
                         <p class="hidden" id="set_instance_name"></p>
diff --git a/app/views/origami/addorders/get_menu_category.json.jbuilder b/app/views/origami/addorders/get_menu_category.json.jbuilder
new file mode 100644
index 00000000..8c96a6c7
--- /dev/null
+++ b/app/views/origami/addorders/get_menu_category.json.jbuilder
@@ -0,0 +1,5 @@
+if @menu.menu_items
+    json.menu_items @menu.menu_items do |item|
+		json.partial! 'origami/addorders/menu_item', item: item
+    end
+end
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 378bcbe3..55e649ed 100644
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -510,7 +510,7 @@ $(document).ready(function(){
 		    url: ajax_url,
 		    data: params,
 		    success:function(result){
-
+console.log(result)
 		    	if (result.status == "Success") {
 		    		type   = 'green'
 		    		btn_color = 'btn-green'
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 4cdcf01d..309caa50 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -38,30 +38,30 @@
      <div class="tab-pane dining active" id="tables" role="tabpanel">
        <div class="card-columns">
          <% @tables.each do |table| %>
-         <% if table.status == 'occupied' %>
-             <% if table.get_booking.nil? %>
-                 <div class="card tables red text-white" data-id="<%= table.id %>">
-                   <div class="card-block">
-                      Zone <%= table.zone_id %> <br>
-                      Table <%= table.name %>  ( <%= table.seater %> Seat )
-                   </div>
-                 </div>
+             <% if table.status == 'occupied' %>
+                 <% if table.get_booking.nil? %>
+                     <div class="card tables red text-white" data-id="<%= table.id %>">
+                       <div class="card-block">
+                          Zone <%= table.zone_id %> <br>
+                          Table <%= table.name %>  ( <%= table.seater %> Seat )
+                       </div>
+                     </div>
+                 <% else %>
+                     <div class="card tables blue text-white" data-id="<%= table.id %>">
+                       <div class="card-block">
+                          Zone <%= table.zone_id %> <br>
+                          Table <%= table.name %>  ( <%= table.seater %> Seat )
+                       </div>
+                     </div>
+                 <% end %>
              <% else %>
-                 <div class="card tables blue text-white" data-id="<%= table.id %>">
+                 <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
                    <div class="card-block">
-                      Zone <%= table.zone_id %> <br>
-                      Table <%= table.name %>  ( <%= table.seater %> Seat )
+                     Zone <%= table.zone_id %> <br>
+                     Table <%= table.name %>  ( <%= table.seater %> Seat )
                    </div>
                  </div>
              <% end %>
-         <% else %>
-         <div class="card tables green text-white" data-id="<%= table.id %>">
-           <div class="card-block">
-             Zone <%= table.zone_id %> <br>
-             Table <%= table.name %>  ( <%= table.seater %> Seat )
-           </div>
-         </div>
-         <% end %>
          <% end %>
        </div>
      </div>
@@ -70,19 +70,19 @@
      <div class="tab-pane dining" id="rooms" role="tabpanel">
        <div class="card-columns">
          <% @rooms.each do |room| %>
-         <% if room.status == 'occupied' %>
-         <div class="card rooms red text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-           </div>
-         </div>
-         <% else %>
-         <div class="card rooms green text-white" data-id="<%= room.id %>">
-           <div class="card-block">
-              <%= room.name %>
-           </div>
-         </div>
-         <% end %>
+           <% if room.status == 'occupied' %>
+             <div class="card rooms red text-white" data-id="<%= room.id %>">
+               <div class="card-block">
+                  <%= room.name %>
+               </div>
+             </div>
+           <% else %>
+             <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
+               <div class="card-block">
+                  <%= room.name %>
+               </div>
+             </div>
+           <% end %>
          <% end %>
        </div>
      </div>
@@ -98,13 +98,13 @@
          </div>
          <% end %>
        </div>
-
      </div>
+     
    </div>
    <!-- tabs - End -->
  </div>
  <div class="col-lg-2 col-md-2 col-sm-2">
-   <button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button>
+   <!-- <button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button> -->
    <button id="cash_in" type="button" class="btn btn-block btn-primary"> Cash In </button>
    <button id="cash_out" type="button" class="btn btn-block btn-primary"> Cash Out </button>
    <!-- Temporary Disabled -->
@@ -146,72 +146,72 @@ $(document).ready(function(){
   })
 });
 
-$(function() {
-    var timer;
+// $(function() {
+//     var timer;
 
-    function start() {
-        timer = setTimeout(function() { console.log("refresh");window.location.reload()}, 10000); //10000
-    };
+//     function start() {
+//         timer = setTimeout(function() { console.log("refresh");window.location.reload()}, 10000); //10000
+//     };
 
-    function stop() {
-        clearTimeout(timer);
-    };
+//     function stop() {
+//         clearTimeout(timer);
+//     };
 
-	if(localStorage.getItem("refreshflag") != null){
-		if (localStorage.getItem("refreshflag") == 0) {
-			$('#refreshbutton').html("Refresh off");
-			$('#refreshbutton').css("background-color","red");
-            stop();
-		}
-		else{
-			$('#refreshbutton').html("Refresh on");
-      $('#refreshbutton').css("background-color","green");
-			start();
-		}
-	}
-	else{
-		localStorage.setItem("refreshflag", 0);
-	}
-    var url = location.href;
-    if (location.href.slice(-1) == "/"){
-      url = url.substring(0, url.length - 1);
-    }
-    var arr = url.split("/");
+// 	if(localStorage.getItem("refreshflag") != null){
+// 		if (localStorage.getItem("refreshflag") == 0) {
+// 			$('#refreshbutton').html("Refresh off");
+// 			$('#refreshbutton').css("background-color","red");
+//             stop();
+// 		}
+// 		else{
+// 			$('#refreshbutton').html("Refresh on");
+//       $('#refreshbutton').css("background-color","green");
+// 			start();
+// 		}
+// 	}
+// 	else{
+// 		localStorage.setItem("refreshflag", 0);
+// 	}
+//     var url = location.href;
+//     if (location.href.slice(-1) == "/"){
+//       url = url.substring(0, url.length - 1);
+//     }
+//     var arr = url.split("/");
 
-    if(arr[arr.length-1] != "origami"){
-        stop();
-    }
-    $('#refreshbutton').bind("click", function(){
-    	if(localStorage.getItem("refreshflag") == "0"){
-    		localStorage.setItem("refreshflag", 1);
-    		$(this).html("Refresh on");
-        $(this).css("background-color","green");
-    		// $(this).html("Auto Refresh on<span class='glyphicon glyphicon-ok'></span>");
-    		start();
-    	}
-    	else{
-    		stop();
-            localStorage.setItem("refreshflag", 0);
-            $(this).html("Refresh off");
-            $(this).css("background-color","red");
-    	}
-    });
-    function refreshing(){
-    	if(localStorage.getItem("refreshflag") == "0"){
-    		localStorage.setItem("refreshflag", 1);
-    		$(this).html("Refresh on");
-        $(this).css("background-color","green");
-    		// $(this).html("Auto Refresh on<span class='glyphicon glyphicon-ok'></span>");
-    		start();
-    	}
-    	else{
-    		stop();
-            localStorage.setItem("refreshflag", 0);
-            $(this).html("Refresh off");
-            $(this).css("background-color","red");
-    	}
-    }
-});
+//     if(arr[arr.length-1] != "origami"){
+//         stop();
+//     }
+//     $('#refreshbutton').bind("click", function(){
+//     	if(localStorage.getItem("refreshflag") == "0"){
+//     		localStorage.setItem("refreshflag", 1);
+//     		$(this).html("Refresh on");
+//         $(this).css("background-color","green");
+//     		// $(this).html("Auto Refresh on<span class='glyphicon glyphicon-ok'></span>");
+//     		start();
+//     	}
+//     	else{
+//     		stop();
+//             localStorage.setItem("refreshflag", 0);
+//             $(this).html("Refresh off");
+//             $(this).css("background-color","red");
+//     	}
+//     });
+//     function refreshing(){
+//     	if(localStorage.getItem("refreshflag") == "0"){
+//     		localStorage.setItem("refreshflag", 1);
+//     		$(this).html("Refresh on");
+//         $(this).css("background-color","green");
+//     		// $(this).html("Auto Refresh on<span class='glyphicon glyphicon-ok'></span>");
+//     		start();
+//     	}
+//     	else{
+//     		stop();
+//             localStorage.setItem("refreshflag", 0);
+//             $(this).html("Refresh off");
+//             $(this).css("background-color","red");
+//     	}
+//     }
+// });
 
 $('#cash_in').on('click',function(){
   window.location.href = '/origami/cash_ins/new';
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 2105918b..312438bb 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -43,25 +43,26 @@
               <% if table.status == 'occupied' %>
 
                   <% if table.get_booking.nil? %>
-                      <div class="card tables red text-white" data-id="<%= table.id %>">
+                      <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
                         <div class="card-block">
                           <%= table.name %>
-                          <span class="pull-right font-12"> billed</span>
+                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                           <div style="font-size:12px;"></div>
                         </div>
                       </div>
                   <% else %>
-                      <div class="card tables blue text-white" data-id="<%= table.id %>">
+                      <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
                         <div class="card-block">
                           <%= table.name %>
-                          <span class="pull-right font-12"> new</span>
+                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                         </div>
                       </div>
                   <% end %>
               <% else %>
-                  <div class="card tables green text-white" data-id="<%= table.id %>">
+                  <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
                     <div class="card-block">
                       <%= table.name %>
+                      <span class="pull-right font-12 new_text_<%= table.id %> hide"> new</span>
                     </div>
                   </div>
               <% end %>
@@ -75,20 +76,21 @@
           <% @rooms.each do |room| %>
               <% if room.status == 'occupied' %>
 
-                  <div class="card rooms red text-white" data-id="<%= room.id %>">
+                  <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                     <div class="card-block">
                       <%= room.name %>
                       <% if room.get_booking.nil? %>
-                          <span class="pull-right font-12"> billed</span>
+                          <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                       <% else %>
-                          <span class="pull-right font-12"> new</span>
+                          <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                       <% end %>
                     </div>
                   </div>
               <% else %>
-                  <div class="card rooms green text-white" data-id="<%= room.id %>">
+                  <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
                     <div class="card-block">
                       <%= room.name %>
+                      <span class="pull-right font-12 new_text_<%= room.id %> hide"> 
                     </div>
                   </div>
               <% end %>
@@ -330,7 +332,7 @@
             <button type="button" id="discount" class="btn btn-primary btn-block">Discount</button>
             <button type="button" id="other-charges" class="btn btn-primary btn-block">Charges</button>
             <button type="button" id="commissions" class="btn btn-primary btn-block">Commissions</button>
-            <button type="button" id="in_juties" class="btn btn-primary btn-block">In Juties</button>
+            <button type="button" id="in_duties" class="btn btn-primary btn-block">In Duties</button>
             <button type="button" class="btn btn-primary btn-block" id='move' disabled="">Move</button>
             <button type="button" id="request_bills" class="btn btn-primary btn-block" disabled> Req.Bill</button>
             <button type="button" id="first_bill" class="btn btn-primary btn-block">First Bill</button>
@@ -577,9 +579,9 @@
         window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
     });
 
-    $('#in_juties').on('click', function () {
+    $('#in_duties').on('click', function () {
         var dining_id = "<%= @dining.id %>"
-        window.location.href = '/origami/assign_in_juty/'+ dining_id;
+        window.location.href = '/origami/assign_in_duty/'+ dining_id;
     });
 
     $('#void').on('click', function () {
diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_duties/_assign_in_duty.html.erb
similarity index 92%
rename from app/views/origami/in_juties/_assign_in_juty.html.erb
rename to app/views/origami/in_duties/_assign_in_duty.html.erb
index e1ec23ed..6303d79f 100644
--- a/app/views/origami/in_juties/_assign_in_juty.html.erb
+++ b/app/views/origami/in_duties/_assign_in_duty.html.erb
@@ -4,22 +4,11 @@
     <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
 
     <div class="form-inputs">
-
       <%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
-
-      <label>Dining Name:</label>
-      <%= @table.name %>
-      <br/>
-      <br/>
-
       <label>Commissioner Name:</label>
       <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
-      <br/><br/>
-
       <%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
-
       <%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %>
-
     </div><br>
 
     <div class="form-group">
diff --git a/app/views/origami/in_juties/_edit_in_juty.html.erb b/app/views/origami/in_duties/_edit_in_duty.html.erb
similarity index 87%
rename from app/views/origami/in_juties/_edit_in_juty.html.erb
rename to app/views/origami/in_duties/_edit_in_duty.html.erb
index a297ac65..41a492eb 100644
--- a/app/views/origami/in_juties/_edit_in_juty.html.erb
+++ b/app/views/origami/in_duties/_edit_in_duty.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for([:origami, @in_juty]) do |f| %>
+<%= simple_form_for([:origami, @in_duty]) do |f| %>
     <%= f.error_notification %>
 
     <div class="form-inputs">
diff --git a/app/views/origami/in_juties/_form.html.erb b/app/views/origami/in_duties/_form.html.erb
similarity index 93%
rename from app/views/origami/in_juties/_form.html.erb
rename to app/views/origami/in_duties/_form.html.erb
index 9bed9152..3351dbd3 100644
--- a/app/views/origami/in_juties/_form.html.erb
+++ b/app/views/origami/in_duties/_form.html.erb
@@ -1,25 +1,18 @@
-<%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
+<%= simple_form_for @in_duty, :url => origami_index_in_duty_path(@table.id), :method => :post do |f| %>
     <span class="patch_method"></span>
     <%= f.error_notification %>
     <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
 
     <div class="form-inputs">
-
-      <%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
-
       <label>Dining Name:</label>
       <%= @table.name %>
-      <br/>
-      <br/>
-
+      <br/><br/>
+      <%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
       <label>Commissioner Name:</label>
       <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
-      <br/><br/>
-
+      <br/>
       <%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
-
       <%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %>
-
     </div><br>
 
     <div class="form-group">
diff --git a/app/views/origami/in_duties/_in_duty.json.jbuilder b/app/views/origami/in_duties/_in_duty.json.jbuilder
new file mode 100644
index 00000000..6b13c2f9
--- /dev/null
+++ b/app/views/origami/in_duties/_in_duty.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! in_duty, :id, :created_at, :updated_at
+json.url in_duty_url(in_duty, format: :json)
diff --git a/app/views/origami/in_juties/assign_in_juty.html.erb b/app/views/origami/in_duties/assign_in_duty.html.erb
similarity index 76%
rename from app/views/origami/in_juties/assign_in_juty.html.erb
rename to app/views/origami/in_duties/assign_in_duty.html.erb
index 7176dea6..31e95a50 100644
--- a/app/views/origami/in_juties/assign_in_juty.html.erb
+++ b/app/views/origami/in_duties/assign_in_duty.html.erb
@@ -1,9 +1,9 @@
 <div class="span12">
 	<div class="page-header">
-	  <h3>Create In Juty</h3>
+	  <h3>Create In Duty</h3>
 	</div>
 	<div class="col-md-3">
-		<%= simple_form_for([:origami,@in_juty]) do |f| %>
+		<%= simple_form_for([:origami,@in_duty]) do |f| %>
   		<%= f.error_notification %>
 
 		  <div class="form-inputs">
@@ -22,10 +22,10 @@
 		  <div class="form-actions">
 		  <div class='row'>
 		    <div class="col-md-2">
-		    <%= link_to 'Back', origami_index_in_juty_path(@table.id), class: 'btn btn-success' %>
+		    <%= link_to 'Back', origami_index_in_duty_path(@table.id), class: 'btn btn-success' %>
 		    </div>
 		    <div class="col-md-10">
-		    <button type="button" class="btn btn-primary btn-block" id='in_juty'>Create In Juty</button>
+		    <button type="button" class="btn btn-primary btn-block" id='in_duty'>Create In Duty</button>
 		    </div>
 		  </div>
 		  </div>
@@ -45,18 +45,18 @@ $(function() {
     $('.datepicker').css('cursor','pointer');
 });
 
- $('#in_juty').on('click', function () {
-        var ajax_url = "/origami/assign_in_juty";
-        var commissioner_ids = $('#in_juty_commissioner_ids').val();
-        var in_time = $('#in_juty_in_time').val();
-        var out_time = $('#in_juty_out_time').val();
+ $('#in_duty').on('click', function () {
+        var ajax_url = "/origami/assign_in_duty";
+        var commissioner_ids = $('#in_duty_commissioner_ids').val();
+        var in_time = $('#in_duty_in_time').val();
+        var out_time = $('#in_duty_out_time').val();
         var dining_id = '<%= @table.id %>'
         $.ajax({
             type: "POST",
             url: ajax_url,
             data: 'dining_id=' + dining_id + "&commissioner_ids=" + commissioner_ids +'&in_time=' + in_time + "&out_time=" + out_time,
             success: function (result) {
-                window.location.href = '/origami/assign_in_juty/'+ dining_id;
+                window.location.href = '/origami/assign_in_duty/'+ dining_id;
             }
         });
     })
diff --git a/app/views/origami/in_juties/edit.html.erb b/app/views/origami/in_duties/edit.html.erb
similarity index 61%
rename from app/views/origami/in_juties/edit.html.erb
rename to app/views/origami/in_duties/edit.html.erb
index 3a6fc774..3e64b2f2 100644
--- a/app/views/origami/in_juties/edit.html.erb
+++ b/app/views/origami/in_duties/edit.html.erb
@@ -2,9 +2,9 @@
 	<div class="page-header">
 	 <ul class="breadcrumb">
 	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%= origami_in_juties_path   %>">In Juties</a></li>
+			<li><a href="<%= origami_in_duties_path   %>">In Duties</a></li>
 	  	<li>Edit</li>
 	 </ul>
 	</div>
-    <%= render 'form', in_juty: @in_juty %>
+    <%= render 'form', in_duty: @in_duty %>
 </div>
\ No newline at end of file
diff --git a/app/views/origami/in_duties/edit_in_duty.html.erb b/app/views/origami/in_duties/edit_in_duty.html.erb
new file mode 100644
index 00000000..bcc984aa
--- /dev/null
+++ b/app/views/origami/in_duties/edit_in_duty.html.erb
@@ -0,0 +1,6 @@
+<div class="span12">
+	<div class="page-header">
+	  <h3>Update In Duty</h3>
+	</div>
+    <%= render 'edit_in_duty', in_duty: @in_duty %>
+</div>
\ No newline at end of file
diff --git a/app/views/origami/in_juties/index.html.erb b/app/views/origami/in_duties/index.html.erb
similarity index 54%
rename from app/views/origami/in_juties/index.html.erb
rename to app/views/origami/in_duties/index.html.erb
index ff5a0fd3..355a7afb 100644
--- a/app/views/origami/in_juties/index.html.erb
+++ b/app/views/origami/in_duties/index.html.erb
@@ -14,27 +14,27 @@
       </thead>
 
       <tbody>
-      <% @juties_in.each do |in_juty| %>
-          <tr class="injuty_tr" data-ref="<%= in_juty.id %>">
+      <% @duties_in.each do |in_duty| %>
+          <tr class="induty_tr" data-ref="<%= in_duty.id %>">
             <td>
               <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check"></td>
-            <td><%= in_juty.dining_facility.name rescue '-' %></td>
-            <td><%= in_juty.commissioner.name rescue '-' %></td>
-            <td><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
-            <td><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
-            <td><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+            <td><%= in_duty.dining_facility.name rescue '-' %></td>
+            <td><%= in_duty.commissioner.name rescue '-' %></td>
+            <td><%= in_duty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
+            <td><%= in_duty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
+            <td><%= link_to 'Destroy', origami_destroy_in_duty_path(in_duty.dining_facility.id, in_duty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
           </tr>
       <% end %>
       </tbody>
     </table>
-    <%= paginate @juties_in %>
+    <%= paginate @duties_in %>
   </div>
 
   <div class="col-md-4 partial">
-    <%= render 'form', in_juty: @in_juty, table: @table %>
+    <%= render 'form', in_duty: @in_duty, table: @table %>
   </div>
   <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_juty_path, :class => 'btn btn-primary btn-sm' %>
+    <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_duty_path, :class => 'btn btn-primary btn-sm' %>
   </span>
 </div>
 
@@ -43,13 +43,13 @@
 </div>
 
 <script type="text/javascript">
-    $(document).on('click', ".injuty_tr", function () {
+    $(document).on('click', ".induty_tr", function () {
 
         $(this).closest('tr').find('.checkbox_check').prop("checked", true);
 
-        var in_juty_id = $(this).attr('data-ref');
+        var in_duty_id = $(this).attr('data-ref');
         var table_id = "<%= @table.id %>";
-        var url = "/origami/assign_in_juty/table/" + table_id + "/in_juty/" + in_juty_id + "/edit";
+        var url = "/origami/assign_in_duty/table/" + table_id + "/in_duty/" + in_duty_id + "/edit";
 
         $.ajax({
             type: "GET",
@@ -59,22 +59,22 @@
             success: function (data) {
                 debugger;
                 $('.partial').empty().append(data);
-//                $('#in_juty_id').val(data.in_juty.id);
-//                $('#in_juty_commissioner_ids').val(data.commissioner.id);
-//                $('#in_juty_in_time').val(data.in_juty.in_time);
-//                $('#in_juty_out_time').val(data.in_juty.out_time);
+//                $('#in_duty_id').val(data.in_duty.id);
+//                $('#in_duty_commissioner_ids').val(data.commissioner.id);
+//                $('#in_duty_in_time').val(data.in_duty.in_time);
+//                $('#in_duty_out_time').val(data.in_duty.out_time);
 //
 //                $('#update').removeAttr('disabled').val('');
 //                $('#update').attr('value', 'Update');
 //                $('#create').attr('disabled', 'disabled');
 //
-//                $("#new_in_juty").attr('class', 'simple_form edit_in_juty');
-//                var id = "edit_in_juty_" + in_juty_id;
-//                $("#new_in_juty").attr('id', id);
+//                $("#new_in_duty").attr('class', 'simple_form edit_in_duty');
+//                var id = "edit_in_duty_" + in_duty_id;
+//                $("#new_in_duty").attr('id', id);
 //
-//                $(".edit_in_juty").attr('id', id);
-//                $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
-//                $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
+//                $(".edit_in_duty").attr('id', id);
+//                $(".edit_in_duty").attr('action', '/origami/edit_in_duty/' + $('#in_duty_id').val());
+//                $(".edit_in_duty").attr('action', '/origami/edit_in_duty/' + $('#in_duty_id').val());
 //                $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
 
 //                setInterval(function () {
diff --git a/app/views/origami/in_duties/index.json.jbuilder b/app/views/origami/in_duties/index.json.jbuilder
new file mode 100644
index 00000000..f37b5ed1
--- /dev/null
+++ b/app/views/origami/in_duties/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @in_duties, partial: 'in_duties/in_duty', as: :in_duty
diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_duties/index_in_duty.html.erb
similarity index 50%
rename from app/views/origami/in_juties/index_in_juty.html.erb
rename to app/views/origami/in_duties/index_in_duty.html.erb
index 52d79c89..e8d34e29 100644
--- a/app/views/origami/in_juties/index_in_juty.html.erb
+++ b/app/views/origami/in_duties/index_in_duty.html.erb
@@ -1,6 +1,10 @@
 <div class="row">
 
-  <div class="col-md-8">
+  <div class="col-md-7">
+    <label>Dining Name:</label>
+    <%= @table.name %>
+    <br/>
+
     <table class="table table-striped">
       <thead>
       <tr>
@@ -14,40 +18,40 @@
       </thead>
 
       <tbody>
-      <% @juties_in.each do |in_juty| %>
-          <tr class="injuty_tr" data-ref="<%= in_juty.id %>">
+      <% @duties_in.each do |in_duty| %>
+          <tr class="induty_tr" data-ref="<%= in_duty.id %>">
             <td>
               <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check"></td>
-            <td><%= in_juty.dining_facility.name rescue '-' %></td>
-            <td><%= in_juty.commissioner.name rescue '-' %></td>
-            <td><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
-            <td><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
-            <td><%= link_to 'Remove', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+            <td><%= in_duty.dining_facility.name rescue '-' %></td>
+            <td><%= in_duty.commissioner.name rescue '-' %></td>
+            <td><%= in_duty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
+            <td><%= in_duty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
+            <td><%= link_to 'Remove', origami_destroy_in_duty_path(in_duty.dining_facility.id, in_duty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
           </tr>
       <% end %>
       </tbody>
     </table>
-    <%= paginate @juties_in %>
+    <%= paginate @duties_in %>
   </div>
 
   <div class="col-md-4 partial">
-    <%= render 'form', in_juty: @in_juty, table: @table %>
+    <%= render 'form', in_duty: @in_duty, table: @table %>
+  </div>
+
+  <div class="col-md-1">
+    <button type="button" class="form-control btn btn-primary btn-block" id='back'>Back</button>
+    <button class="form-control btn btn-info btn-block" id="reset">New</button>
   </div>
 </div>
 
-<div class="row">
-  &nbsp;&nbsp;<button type="button" class="col-md-1 btn btn-primary btn-block" id='back'>Back</button>&nbsp;&nbsp;
-  <button class="col-md-1 btn btn-info" id="reset">New</button>
-</div>
-
 <script type="text/javascript">
-    $(document).on('click', ".injuty_tr", function () {
+    $(document).on('click', ".induty_tr", function () {
 
         $(this).closest('tr').find('.checkbox_check').prop("checked", true);
 
-        var in_juty_id = $(this).attr('data-ref');
+        var in_duty_id = $(this).attr('data-ref');
         var table_id = "<%= @table.id %>";
-        var url = "/origami/assign_in_juty/table/" + table_id + "/in_juty/" + in_juty_id + "/edit";
+        var url = "/origami/assign_in_duty/table/" + table_id + "/in_duty/" + in_duty_id + "/edit";
 
         $.ajax({
             type: "GET",
@@ -57,22 +61,22 @@
             success: function (data) {
                 debugger;
                 $('.partial').empty().append(data);
-//                $('#in_juty_id').val(data.in_juty.id);
-//                $('#in_juty_commissioner_ids').val(data.commissioner.id);
-//                $('#in_juty_in_time').val(data.in_juty.in_time);
-//                $('#in_juty_out_time').val(data.in_juty.out_time);
+//                $('#in_duty_id').val(data.in_duty.id);
+//                $('#in_duty_commissioner_ids').val(data.commissioner.id);
+//                $('#in_duty_in_time').val(data.in_duty.in_time);
+//                $('#in_duty_out_time').val(data.in_duty.out_time);
 //
 //                $('#update').removeAttr('disabled').val('');
 //                $('#update').attr('value', 'Update');
 //                $('#create').attr('disabled', 'disabled');
 //
-//                $("#new_in_juty").attr('class', 'simple_form edit_in_juty');
-//                var id = "edit_in_juty_" + in_juty_id;
-//                $("#new_in_juty").attr('id', id);
+//                $("#new_in_duty").attr('class', 'simple_form edit_in_duty');
+//                var id = "edit_in_duty_" + in_duty_id;
+//                $("#new_in_duty").attr('id', id);
 //
-//                $(".edit_in_juty").attr('id', id);
-//                $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
-//                $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
+//                $(".edit_in_duty").attr('id', id);
+//                $(".edit_in_duty").attr('action', '/origami/edit_in_duty/' + $('#in_duty_id').val());
+//                $(".edit_in_duty").attr('action', '/origami/edit_in_duty/' + $('#in_duty_id').val());
 //                $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
 
 //                setInterval(function () {
@@ -87,14 +91,14 @@
     });
 
     $('#reset').click(function () {
-        var url = "<%= new_origami_in_juty_path %>";
+        var url = "<%= new_origami_in_duty_path %>";
         $.ajax({
             type: "GET",
             url: url,
             data: { table_id: <%= @table.id %> },
             success: function (data) {
                 $('.partial').empty().append(data);
-                $('.injuty_tr > td > .checkbox_check').prop("checked", false);
+                $('.induty_tr > td > .checkbox_check').prop("checked", false);
             }
         });
     });
diff --git a/app/views/origami/in_juties/new.html.erb b/app/views/origami/in_duties/new.html.erb
similarity index 58%
rename from app/views/origami/in_juties/new.html.erb
rename to app/views/origami/in_duties/new.html.erb
index f59ff6fd..e48fd5ba 100644
--- a/app/views/origami/in_juties/new.html.erb
+++ b/app/views/origami/in_duties/new.html.erb
@@ -2,9 +2,9 @@
 	<div class="page-header">
 	 <ul class="breadcrumb">
 	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%=  origami_in_juties_path  %>">In Juties</a></li>
+			<li><a href="<%=  origami_in_juties_path  %>">In Duties</a></li>
 	  	<li>New</li>
 	 </ul>
 	</div>
-    <%= render 'form', in_juty: @in_juty, table: @table %>
+    <%= render 'form', in_duty: @in_duty, table: @table %>
 </div>
diff --git a/app/views/origami/in_juties/show.html.erb b/app/views/origami/in_duties/show.html.erb
similarity index 59%
rename from app/views/origami/in_juties/show.html.erb
rename to app/views/origami/in_duties/show.html.erb
index 34d72071..40eb15f9 100644
--- a/app/views/origami/in_juties/show.html.erb
+++ b/app/views/origami/in_duties/show.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
   <ul class="breadcrumb">
     <li><a href="<%= origami_root_path %>">Home</a></li>
-    <li><a href="<%= origami_in_juties_path %>">In Juties</a></li>
+    <li><a href="<%= origami_in_duties_path %>">In Duties</a></li>
 
     <span style="float: right">
   </span>
@@ -9,34 +9,34 @@
 </div>
 <div class="card">
   <div class="card-block">
-    <h4 class="card-title">In Juty</h4>
+    <h4 class="card-title">In Duty</h4>
     <table class="table">
 
       <tbody>
 
       <tr>
         <td style="width:20%">Dining Facility Name</td>
-        <td><%= @in_juty.dining_facility.name%></td>
+        <td><%= @in_duty.dining_facility.name%></td>
       </tr>
       <tr>
         <td style="width:20%">Commissioner Name</td>
         <td>
-          <%= @in_juty.commissioner.name rescue '-' %>
+          <%= @in_duty.commissioner.name rescue '-' %>
         </td>
       </tr>
       <tr>
         <td style="width:20%">In Time</td>
-        <td><%= @in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
+        <td><%= @in_duty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
       </tr>
       <tr>
         <td style="width:20%">Out Time</td>
-        <td><%= @in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
+        <td><%= @in_duty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
       </tr>
       </tbody>
     </table>
-    <%= link_to 'Back', origami_in_juties_path, class: 'btn btn-success' %>
-    <%= link_to 'Edit', edit_origami_in_juty_path(@in_juty), class: 'btn btn-info' %>
-    <%= link_to 'Destroy', origami_in_juty_path(@in_juty), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
+    <%= link_to 'Back', origami_in_duties_path, class: 'btn btn-success' %>
+    <%= link_to 'Edit', edit_origami_in_duty_path(@in_duty), class: 'btn btn-info' %>
+    <%= link_to 'Destroy', origami_in_duty_path(@in_duty), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
   </div>
 </div>
 
diff --git a/app/views/origami/in_duties/show.json.jbuilder b/app/views/origami/in_duties/show.json.jbuilder
new file mode 100644
index 00000000..97151b48
--- /dev/null
+++ b/app/views/origami/in_duties/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "in_duties/in_duty", in_duty: @in_duty
diff --git a/app/views/origami/in_juties/_in_juty.json.jbuilder b/app/views/origami/in_juties/_in_juty.json.jbuilder
deleted file mode 100644
index bad1d379..00000000
--- a/app/views/origami/in_juties/_in_juty.json.jbuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-json.extract! in_juty, :id, :created_at, :updated_at
-json.url in_juty_url(in_juty, format: :json)
diff --git a/app/views/origami/in_juties/edit_in_juty.html.erb b/app/views/origami/in_juties/edit_in_juty.html.erb
deleted file mode 100644
index 473071d0..00000000
--- a/app/views/origami/in_juties/edit_in_juty.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="span12">
-	<div class="page-header">
-	  <h3>Update In Juty</h3>
-	</div>
-    <%= render 'edit_in_juty', in_juty: @in_juty %>
-</div>
\ No newline at end of file
diff --git a/app/views/origami/in_juties/index.json.jbuilder b/app/views/origami/in_juties/index.json.jbuilder
deleted file mode 100644
index ebc804e9..00000000
--- a/app/views/origami/in_juties/index.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.array! @in_juties, partial: 'in_juties/in_juty', as: :in_juty
diff --git a/app/views/origami/in_juties/show.json.jbuilder b/app/views/origami/in_juties/show.json.jbuilder
deleted file mode 100644
index b7fd0d65..00000000
--- a/app/views/origami/in_juties/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.partial! "in_juties/in_juty", in_juty: @in_juty
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index e9cc09fa..eaf1f07e 100644
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -7,163 +7,197 @@
 				<h2>JCB</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-									<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_jcb %>" data-member-value="">
-						</div>
-						<hr>
+		<span class="hidden" id="membership_id"><%= @membership_id%></span>
+		<span class="hidden" id="member_discount"><%= @member_discount%></span>
+		<span class="hidden" id="sub-total"><%= @sub_total%></span>
+		<div class="card" style="margin-top:10px;padding-top:20px;">
+			<div class="rebate-form">
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+						<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_jcb %>" data-member-value="">
 					</div>
-					<% if @jcbcount != 0 %>
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">Recent JCB paid amount </label>
-									<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@jcbcount %>" data-member-value="">
-						</div>
-						<hr>
+					<hr>
+				</div>
+				<% if @jcbcount != 0 %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Recent JCB paid amount </label>
+						<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@jcbcount %>" data-member-value="">
 					</div>
-					<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
+					<hr>
+				</div>
+				<% end %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+						<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+						<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+					</div>
+					<hr>
+				</div>
 			</div>
+		</div>
 	</div>
 
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+	<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
 
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="jcb_pay">Pay</div>
-           </div>
-         </div>
-      </div>
-
-    </div>
-
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+		<div class="row">
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="1" data-type="num">1</div>
+					<div class=" cashier_number left" data-value="2" data-type="num">2</div>
+					<div class=" cashier_number left" data-value="3" data-type="num">3</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="4" data-type="num">4</div>
+					<div class=" cashier_number left" data-value="5" data-type="num">5</div>
+					<div class=" cashier_number left" data-value="6" data-type="num">6</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="7" data-type="num">7</div>
+					<div class=" cashier_number left" data-value="8" data-type="num">8</div>
+					<div class=" cashier_number left" data-value="9" data-type="num">9</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="0" data-type="num">0</div>
+					<div class=" cashier_number left" data-value="." data-type="num">.</div>
+					<div class=" cashier_number left" data-value="00" data-type="num">00</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number green" data-type="nett" >Nett</div>
+					<div class=" cashier_number red left" data-type="del">Del</div>
+					<div class=" cashier_number orange left" data-type="clr">Clr</div>
+				</div>
+			</div>
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+					<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+				</div>
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+					<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+				</div>
+				<div class="row bottom">
+					<div class="pay purple" id="jcb_pay">Pay</div>
+				</div>
+			</div>
 		</div>
+
+	</div>
+
+	<div class="col-lg-1 col-md-1 col-sm-1">
+		<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+	</div>
 </div>
 
 <script>
-$(document).ready(function() {
+	$(document).ready(function() {
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
+			else {
+				$('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
+			}
+		});
 // number key pad
 $(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+	event.stopPropagation();
+	event.preventDefault();
+	if(event.handled !== true) {
+		var original_value;
+		original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+		var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+		var input_type = $(this).attr("data-type");
+		switch (input_type) {
+			case 'num':
+			if (original_value == "0.0"){
+				$('#amount').text(input_value);
+			}else{
+				$('#amount').append(input_value);
+			}
+			break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+			case 'add':
+			var input_value = $(this).attr("data-value");
+			amount = parseInt(input_value) + parseInt(original_value);
+			$('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+			break;
+			case 'clr':
+			$('#amount').html("0.0");
+			break;
+			case 'del' :
+			var cash=$('#amount').text();
+			$('#amount').text(cash.substr(0,cash.length-1));
+			break;
+			case 'nett':
+			var remain_amount = $('#validamount').val();
+			$('#amount').text(remain_amount);
+			break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
+		}
+		event.handled = true;
+	} else {
+		return false;
+	}
 });
 
 
-  $('#jcb_pay').on('click',function(){
-    var amount = $('#amount').text();
-    var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+$('#jcb_pay').on('click',function(){
+	var amount = $('#amount').text();
+	var sale_id = "<%= @sale_id %>";
+	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+			//start member discount 5% by pay card	
+			var sub_total = $('#sub-total').text();
+			var member_id = $('#membership_id').text();
+			var member_discount = $('#member_discount').text();
+			if (member_id && member_discount) {
+				$.ajax({
+					type: "POST",
+					url: "/origami/" + sale_id + "/member_discount",
+					data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+	              // success:function(result){           
+	              // }
+	          });
+			}
+	    //end member discount
 	    $.ajax({type: "POST",
-	      url: "<%= origami_payment_jcb_path  %>",
-	      data: "amount="+ amount + "&sale_id="+ sale_id,
-	      success:function(result){
-	        if(result){
-	          alert("Payment success")
-	          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	       }
-	      }
+	    	url: "<%= origami_payment_jcb_path  %>",
+	    	data: "amount="+ amount + "&sale_id="+ sale_id,
+	    	success:function(result){
+	    		if(result){
+	    			$.confirm({
+		              title: 'Infomation!',
+		              content: 'Payment Successfully',
+		              buttons: {
+		                confirm: {
+		                text: 'Ok',
+		                btnClass: 'btn-green',
+		                  action: function(){
+		                    window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		                  }
+		                }
+		              }
+		            });
+	    		}
+	    	}
 	    });
-		}else{
-			alert("Paid Amount is over!");
-		}
-  })
+	}else{
+		$.alert({
+			title: 'Alert!',
+			content: "Paid Amount is over!",
+			type: 'red',
+			typeAnimated: true,
+			btnClass: 'btn-danger',
+		});
+	}
+})
 </script>
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 6afc1081..ab396252 100644
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -7,160 +7,194 @@
 				<h2>Master</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-									<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_master %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% if @mastercount != 0 %>
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">Recent Master paid amount </label>
-									<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mastercount %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
-			</div>
-	</div>
-
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
-
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="master_pay">Pay</div>
-           </div>
-         </div>
+    <span class="hidden" id="membership_id"><%= @membership_id%></span>
+    <span class="hidden" id="member_discount"><%= @member_discount%></span>
+    <span class="hidden" id="sub-total"><%= @sub_total%></span>
+    <div class="card" style="margin-top:10px;padding-top:20px;">
+      <div class="rebate-form">
+       <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+          <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_master %>" data-member-value="">
+        </div>
+        <hr>
       </div>
-
+      <% if @mastercount != 0 %>
+      <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">Recent Master paid amount </label>
+          <input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mastercount %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% end %>
+      <div class="row">
+       <div class="form-group col-lg-12 col-md-12 col-sm-12">
+        <label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+      </div>
+      <hr>
     </div>
+    <div class="row">
+     <div class="form-group col-lg-12 col-md-12 col-sm-12">
+      <label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+      <div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+    </div>
+    <hr>
+  </div>
+</div>
+</div>
+</div>
 
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
-		</div>
+<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+
+ <div class="row">
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="1" data-type="num">1</div>
+       <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+       <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="4" data-type="num">4</div>
+       <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+       <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="7" data-type="num">7</div>
+       <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+       <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="0" data-type="num">0</div>
+       <div class=" cashier_number left" data-value="." data-type="num">.</div>
+       <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number green" data-type="nett" >Nett</div>
+       <div class=" cashier_number red left" data-type="del">Del</div>
+       <div class=" cashier_number orange left" data-type="clr">Clr</div>
+     </div>
+   </div>
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+       <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+     </div>
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+       <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+     </div>
+     <div class="row bottom">
+       <div class="pay purple" id="master_pay">Pay</div>
+     </div>
+   </div>
+ </div>
+
+</div>
+
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+</div>
 </div>
 
 <script>
-$(document).ready(function() {
-		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
-$(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+  $(document).ready(function() {
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+     else {
+       $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
+     }
+   });
+  $(document).on('click', '.cashier_number', function(event){
+    event.stopPropagation();
+    event.preventDefault();
+    if(event.handled !== true) {
+      var original_value;
+      original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+      var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+      var input_type = $(this).attr("data-type");
+      switch (input_type) {
+        case 'num':
+        if (original_value == "0.0"){
+         $('#amount').text(input_value);
+       }else{
+         $('#amount').append(input_value);
+       }
+       break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+       case 'add':
+       var input_value = $(this).attr("data-value");
+       amount = parseInt(input_value) + parseInt(original_value);
+       $('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+       break;
+       case 'clr':
+       $('#amount').html("0.0");
+       break;
+       case 'del' :
+       var cash=$('#amount').text();
+       $('#amount').text(cash.substr(0,cash.length-1));
+       break;
+       case 'nett':
+       var remain_amount = $('#validamount').val();
+       $('#amount').text(remain_amount);
+       break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
+     }
+     event.handled = true;
+   } else {
+    return false;
+  }
 });
   $('#master_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
-    $.ajax({type: "POST",
-      url: "<%= origami_payment_master_path  %>",
-      data: "amount="+ amount + "&sale_id="+ sale_id,
-      success:function(result){
-        if(result){
-          alert("Payment success")
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-       }
+    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+      //start member discount 5% by pay card  
+      var sub_total = $('#sub-total').text();
+      var member_id = $('#membership_id').text();
+      var member_discount = $('#member_discount').text();
+      if (member_id && member_discount) {
+        $.ajax({
+          type: "POST",
+          url: "/origami/" + sale_id + "/member_discount",
+          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+                // success:function(result){           
+                // }
+              });
       }
-    });
-	}else{
-		alert("Paid Amount is over!");
-	}
+      //end member discount
+      $.ajax({type: "POST",
+        url: "<%= origami_payment_master_path  %>",
+        data: "amount="+ amount + "&sale_id="+ sale_id,
+        success:function(result){
+          if(result){
+            $.confirm({
+                  title: 'Infomation!',
+                  content: 'Payment Successfully',
+                  buttons: {
+                    confirm: {
+                    text: 'Ok',
+                    btnClass: 'btn-green',
+                      action: function(){
+                        window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                      }
+                    }
+                  }
+                });
+          }
+        }
+      });
+    }else{
+      $.alert({
+        title: 'Alert!',
+        content: "Paid Amount is over!",
+        type: 'red',
+        typeAnimated: true,
+        btnClass: 'btn-danger',
+      });
+    }
   })
 </script>
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index d8abdd86..cdae3eb5 100644
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -218,8 +218,20 @@ $(document).ready(function(){
 	    $(this).addClass('selected-item');
       var dining_name = $(this).attr("data-name");
       var dining_id = $(this).attr("data-id");
-      $('#moved').text(" ' " + dining_name + " ' ")
-      $('#change_table_value').val(dining_id);
+      var change_from = "<%= @dining.id %>";
+      if (dining_id == change_from) {
+        $.alert({
+          title: 'Alert!',
+          content: 'Please Select Another Table',
+          type: 'red',
+          typeAnimated: true,
+          btnClass: 'btn-danger',
+        });
+      }else{
+        $('#moved').text(" ' " + dining_name + " ' ")
+        $('#change_table_value').val(dining_id);
+      }
+     
   })
 
   $(".rooms").on('click', function(){
@@ -227,8 +239,19 @@ $(document).ready(function(){
     $(this).addClass('selected-item');
     var dining_name = $(this).attr("data-name");
     var dining_id = $(this).attr("data-id");
-    $('#moved').text(dining_name)
-    $('#change_table_value').val(dining_id);
+    var change_from = "<%= @dining.id %>";
+    if (dining_id == change_from) {
+        $.alert({
+          title: 'Alert!',
+          content: 'Please Select Another Table',
+          type: 'red',
+          typeAnimated: true,
+          btnClass: 'btn-danger',
+        });
+      }else{
+        $('#moved').text(dining_name)
+        $('#change_table_value').val(dining_id);
+      }
   })
 
   $('#move_table').on('click',function(){
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index e8e25b2f..30d12d35 100644
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -7,160 +7,195 @@
 				<h2>MPU</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-						      	<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_mpu %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-						<% if @mpucount != 0 %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Recent MPU paid amount </label>
-						      	<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mpucount %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-						<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
+		<span class="hidden" id="membership_id"><%= @membership_id%></span>
+		<span class="hidden" id="member_discount"><%= @member_discount%></span>
+		<span class="hidden" id="sub-total"><%= @sub_total%></span>
+		<div class="card" style="margin-top:10px;padding-top:20px;">
+			<div class="rebate-form">
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+						<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_mpu %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<% if @mpucount != 0 %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Recent MPU paid amount </label>
+						<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mpucount %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<% end %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+						<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+						<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+					</div>
+					<hr>
+				</div>
 			</div>
+		</div>
 	</div>
 
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+	<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
 
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="mpu_pay">Pay</div>
-           </div>
-         </div>
-      </div>
-
-    </div>
-
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+		<div class="row">
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="1" data-type="num">1</div>
+					<div class=" cashier_number left" data-value="2" data-type="num">2</div>
+					<div class=" cashier_number left" data-value="3" data-type="num">3</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="4" data-type="num">4</div>
+					<div class=" cashier_number left" data-value="5" data-type="num">5</div>
+					<div class=" cashier_number left" data-value="6" data-type="num">6</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="7" data-type="num">7</div>
+					<div class=" cashier_number left" data-value="8" data-type="num">8</div>
+					<div class=" cashier_number left" data-value="9" data-type="num">9</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="0" data-type="num">0</div>
+					<div class=" cashier_number left" data-value="." data-type="num">.</div>
+					<div class=" cashier_number left" data-value="00" data-type="num">00</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number green" data-type="nett" >Nett</div>
+					<div class=" cashier_number red left" data-type="del">Del</div>
+					<div class=" cashier_number orange left" data-type="clr">Clr</div>
+				</div>
+			</div>
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+					<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+				</div>
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+					<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+				</div>
+				<div class="row bottom">
+					<div class="pay purple" id="mpu_pay">Pay</div>
+				</div>
+			</div>
 		</div>
+
+	</div>
+
+	<div class="col-lg-1 col-md-1 col-sm-1">
+		<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+	</div>
 </div>
 
 <script>
-$(document).ready(function() {
+	$(document).ready(function() {
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
-$(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+			else {
+				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
+			}
+		});
+	$(document).on('click', '.cashier_number', function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		if(event.handled !== true) {
+			var original_value;
+			original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+			var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+			var input_type = $(this).attr("data-type");
+			switch (input_type) {
+				case 'num':
+				if (original_value == "0.0"){
+					$('#amount').text(input_value);
+				}else{
+					$('#amount').append(input_value);
+				}
+				break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+				case 'add':
+				var input_value = $(this).attr("data-value");
+				amount = parseInt(input_value) + parseInt(original_value);
+				$('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+				break;
+				case 'clr':
+				$('#amount').html("0.0");
+				break;
+				case 'del' :
+				var cash=$('#amount').text();
+				$('#amount').text(cash.substr(0,cash.length-1));
+				break;
+				case 'nett':
+				var remain_amount = $('#validamount').val();
+				$('#amount').text(remain_amount);
+				break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
-});
-  $('#mpu_pay').on('click',function(){
-    var amount = $('#amount').text();
-    var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
-	    $.ajax({type: "POST",
-	      url: "<%= origami_payment_mpu_path  %>",
-	      data: "amount="+ amount + "&sale_id="+ sale_id,
-	      success:function(result){
-	        if(result){
-	          alert("Payment success")
-	          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	       }
-	      }
-	    });
-		}else{
-			alert("Paid Amount is over!")
+			}
+			event.handled = true;
+		} else {
+			return false;
 		}
-  })
-</script>
+	});
+	$('#mpu_pay').on('click',function(){
+		var amount = $('#amount').text();
+		var sale_id = "<%= @sale_id %>";
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+		//start member discount 5% by pay card	
+		var sub_total = $('#sub-total').text();
+		var member_id = $('#membership_id').text();
+		var member_discount = $('#member_discount').text();
+		if (member_id && member_discount) {
+			$.ajax({
+				type: "POST",
+				url: "/origami/" + sale_id + "/member_discount",
+				data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+	              // success:function(result){           
+	              // }
+	          });
+		}
+	    //end member discount
+	         //Mpu Payment
+	         $.ajax({type: "POST",
+	         	url: "<%= origami_payment_mpu_path  %>",
+	         	data: "amount="+ amount + "&sale_id="+ sale_id,
+	         	success:function(result){
+	         		if(result){
+	    			$.confirm({
+		              title: 'Infomation!',
+		              content: 'Payment Successfully',
+		              buttons: {
+		                confirm: {
+		                text: 'Ok',
+		                btnClass: 'btn-green',
+		                  action: function(){
+		                    window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		                  }
+		                }
+		              }
+		            });
+	    		}
+	         	}
+	         });
+	     }else{
+	     	$.alert({
+				title: 'Alert!',
+				content: "Paid Amount is over!",
+				type: 'red',
+				typeAnimated: true,
+				btnClass: 'btn-danger',
+			});
+	     }
+	 })
+	</script>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index bc614504..2bbd7cfc 100644
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -38,7 +38,7 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @tables.each do |table| %>
          <% if table.status == 'occupied' %>
-         <div class="card tables red text-white" data-id="<%= table.id %>">
+         <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
            <div class="card-block">
               <%= table.name %>
               <% if table.get_booking.nil? %>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 36c4cc0e..f0298e73 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1,8 +1,8 @@
 <div id="loading_wrapper" style="display:none;">
-        <div id="loading"></div>
-      </div>
+  <div id="loading"></div>
+</div>
 <div class="row">
-<div class="col-lg-6 col-md-6 col-sm-3">
+  <div class="col-lg-6 col-md-6 col-sm-3">
     <div class="card"  >
       <div class="card-header">
         <div id="order-title">
@@ -17,6 +17,8 @@
             </tr>
             <tr>
               <td style="width:50%;"><strong>Customer :</strong> <%= @sale_data.customer.name%></td>
+              <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
+              <span class="hidden" id="member_discount"><%= @member_discount%></span>
               <td style="width:50%;"><strong>Customer ID :</strong> <%= @sale_data.customer.customer_id%></td>
             </tr>
           </table>
@@ -26,82 +28,82 @@
         <div class="card-title">
           <table >
             <!-- <thead> -->
-              <tr>
-                <th style="width:5%">#</th>
-                <th style="width:76%;">Items</th>
-                <th style="width:20%;">QTY</td>
+            <tr>
+              <th style="width:5%">#</th>
+              <th style="width:76%;">Items</th>
+              <th style="width:20%;">QTY</td>
                 <th style="width:20%;">Price</td>
-              </tr>
-            <!-- </thead> -->
-          </table>
-        </div>
-        <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
-          <table class="table" id="append-table">
-            <tbody>
-            <% sub_total = 0
-                count = 0
-            %>
-            <% @sale_data.sale_items.each do |sale_item|
-                count += 1
-               %>
+                </tr>
+                <!-- </thead> -->
+              </table>
+            </div>
+            <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
+              <table class="table" id="append-table">
+                <tbody>
+                  <% sub_total = 0
+                  count = 0
+                  %>
+                  <% @sale_data.sale_items.each do |sale_item|
+                    count += 1
+                    %>
 
-                <% sub_total += sale_item.price%>
-                <tr>
+                    <% sub_total += sale_item.price%>
+                    <tr>
                       <td><%= count %></td>
                       <td style="width:60%; text-align:left">
-                         <span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
-                      </td>
-                      <td style="width:20%; text-align:right">
-                        <span id="item-qty"><%=sale_item.qty%></span>
-                      </td>
-                      <td style="width:20%; text-align:right">
-                         <span id="item-total-price"><%=(sale_item.price)%></span>
-                      </td>
-                    </tr>
-              <%end %>
-            </tbody>
-          </table>
-        </div>
-        <div class="card-footer">
-          <table class="table" style="margin-bottom:0px">
-            <tfooter>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Sub Total</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span id="sub-total"><%=sub_total%></span></strong></td>
-              </tr>
-              <tr>
-                <%if @sale_data.discount_type == 'member_discount'%>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Member Discount:</strong></td>
-               <%else%>
-                <td style="width:80%; text-align:left; border-top:none"><strong>(Discount)</strong></td>
-               <%end%>
-                
-                <td style="width:20%; text-align:right; border-top:none"><strong><span>(<%=@sale_data.total_discount rescue 0%>)</span></strong></td>
-              </tr>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Tax</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.total_tax rescue 0%></span></strong></td>
-              </tr>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Rounding Adj:</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.rounding_adjustment rescue 0%></span></strong></td>
-              </tr>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Grand Total</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.grand_total rescue 0%></span></strong></td>
-              </tr>
-             <%if @balance > 0%>
-             <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong><%= @accountable_type %></strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@balance%></span></strong></td>
-              </tr>
-              <% end %>
-            </tfooter>
-          </table>
-        </div>
-        <div style='text-align:center;margin-top:20px'>
+                       <span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
+                     </td>
+                     <td style="width:20%; text-align:right">
+                      <span id="item-qty"><%=sale_item.qty%></span>
+                    </td>
+                    <td style="width:20%; text-align:right">
+                     <span id="item-total-price"><%=(sale_item.price)%></span>
+                   </td>
+                 </tr>
+                 <%end %>
+               </tbody>
+             </table>
+           </div>
+           <div class="card-footer">
+            <table class="table" style="margin-bottom:0px">
+              <tfooter>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Sub Total</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span id="sub-total"><%=sub_total%></span></strong></td>
+                </tr>
+                <tr>
+                  <%if @sale_data.discount_type == 'member_discount'%>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Member Discount:</strong></td>
+                  <%else%>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>(Discount)</strong></td>
+                  <%end%>
+
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span>(<%=@sale_data.total_discount rescue 0%>)</span></strong></td>
+                </tr>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Tax</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.total_tax rescue 0%></span></strong></td>
+                </tr>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Rounding Adj:</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.rounding_adjustment rescue 0%></span></strong></td>
+                </tr>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Grand Total</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.grand_total rescue 0%></span></strong></td>
+                </tr>
+                <%if @balance > 0%>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong><%= @accountable_type %></strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@balance%></span></strong></td>
+                </tr>
+                <% end %>
+              </tfooter>
+            </table>
+          </div>
+          <div style='text-align:center;margin-top:20px'>
           <!-- <INPUT TYPE="Button" class='btn btn-primary' VALUE="Reprint" onClick="" style='width:120px'/>
-        <INPUT TYPE="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/> -->
+          <INPUT TYPE="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/> -->
         </div>
       </div>
     </div>
@@ -123,159 +125,159 @@
       <div class="col-md-4" id="credit"><%= @credit %></div>
     </div>
     <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%>
-      <div class="row payment other-payment-color" id="card_payment" >
-        <div class="col-md-8">Other Payments</div>
-        <div class="col-md-4" id="others"><%= @other %></div>
-      </div>
+    <div class="row payment other-payment-color" id="card_payment" >
+      <div class="col-md-8">Other Payments</div>
+      <div class="col-md-4" id="others"><%= @other %></div>
+    </div>
     <% else %>
-      <div class="row payment other-payment-color" id="card_payment"  >
-        <div class="col-md-12">Other Payments</div>
-      </div>
+    <div class="row payment other-payment-color" id="card_payment"  >
+      <div class="col-md-12">Other Payments</div>
+    </div>
     <% end %>
 
-       <!-- mpu -->
-      <% if @other != 0.0 %>
-        <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">MPU</div>
-          <div class="col-md-4" id="others"><%= @other %></div>
-        </div>
-      <% else %>
-        <div class="row" style="display:none">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">MPU</div>
-          <div class="col-md-4" id="others">0.0</div>
-        </div>
-      <% end %>
-      <!-- paypar -->
-      <% if @ppamount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Redeem</div>
-        <div class="col-md-4" id="ppamount"><%= @ppamount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Redeem</div>
-        <div class="col-md-4" id="ppamount">0.0</div>
-      </div>
-      <% end %>
-      <!-- Visa -->
-      <% if @visacount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Visa</div>
-        <div class="col-md-4" id="visacount"><%= @visacount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Visa</div>
-        <div class="col-md-4" id="visacount">0.0</div>
-      </div>
-      <% end %>
-      <!-- JCB -->
-      <% if @jcbcount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">JCB</div>
-        <div class="col-md-4" id="jcbcount"><%= @jcbcount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">JCB</div>
-        <div class="col-md-4" id="jcbcount">0.0</div>
-      </div>
-      <% end %>
-      <!-- Master -->
-      <% if @mastercount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Master</div>
-        <div class="col-md-4" id="mastercount"><%= @mastercount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Master</div>
-        <div class="col-md-4" id="mastercount">0.0</div>
-      </div>
-      <% end %>
-      <br>
+    <!-- mpu -->
+    <% if @other != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">MPU</div>
+      <div class="col-md-4 mpu is_card" id="others"><%= @other %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">MPU</div>
+      <div class="col-md-4" id="others">0.0</div>
+    </div>
+    <% end %>
+    <!-- paypar -->
+    <% if @ppamount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Redeem</div>
+      <div class="col-md-4" id="ppamount"><%= @ppamount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Redeem</div>
+      <div class="col-md-4" id="ppamount">0.0</div>
+    </div>
+    <% end %>
+    <!-- Visa -->
+    <% if @visacount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Visa</div>
+      <div class="col-md-4 visa is_card" id="visacount"><%= @visacount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Visa</div>
+      <div class="col-md-4" id="visacount">0.0</div>
+    </div>
+    <% end %>
+    <!-- JCB -->
+    <% if @jcbcount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">JCB</div>
+      <div class="col-md-4 jcb is_card" id="jcbcount"><%= @jcbcount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">JCB</div>
+      <div class="col-md-4" id="jcbcount">0.0</div>
+    </div>
+    <% end %>
+    <!-- Master -->
+    <% if @mastercount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Master</div>
+      <div class="col-md-4 master is_card" id="mastercount"><%= @mastercount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Master</div>
+      <div class="col-md-4" id="mastercount">0.0</div>
+    </div>
+    <% end %>
+    <br>
     <div class="row">
       <div class="col-md-8"><strong style="font-size:18px;">Balance</strong></div>
       <div class="col-md-4"><strong style="font-size:18px;"><span id='balance'><%= @sale_data.grand_total %></span></strong></div>
     </div>
     <br>
 
-      <div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett">Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="pay">Pay</div>
-           </div>
-         </div>
-      </div>
+    <div class="row">
+     <div class="col-lg-6 col-md-1 col-sm-1">
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="1" data-type="num">1</div>
+         <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+         <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="4" data-type="num">4</div>
+         <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+         <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="7" data-type="num">7</div>
+         <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+         <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="0" data-type="num">0</div>
+         <div class=" cashier_number left" data-value="." data-type="num">.</div>
+         <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number green" data-type="nett">Nett</div>
+         <div class=" cashier_number red left" data-type="del">Del</div>
+         <div class=" cashier_number orange left" data-type="clr">Clr</div>
+       </div>
+     </div>
+     <div class="col-lg-6 col-md-1 col-sm-1">
+       <div class="row bottom">
+         <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+         <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+       </div>
+       <div class="row bottom">
+         <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+         <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+       </div>
+       <div class="row bottom">
+         <div class="pay purple" id="pay">Pay</div>
+       </div>
+     </div>
+   </div>
 
-  </div>
-  <div class="col-lg-1 col-md-1 col-sm-1">
-    <!-- Waiter Buttons -->
+ </div>
+ <div class="col-lg-1 col-md-1 col-sm-1">
+  <!-- Waiter Buttons -->
 
-    <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
-    <button type="button" class="btn btn-primary btn-block" id="foc"> FOC </button>
-    <button type="button" class="btn btn-primary btn-block" id="void"> Void </button>
-  </div>
+  <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
+  <button type="button" class="btn btn-primary btn-block" id="foc"> FOC </button>
+  <button type="button" class="btn btn-primary btn-block" id="void"> Void </button>
+</div>
 
 
-  </div>
+</div>
 
 <script>
-$(document).ready(function(){
-  if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-  else {
-    $('#cash').text(localStorage.getItem("cash"));
-  }
-  update_balance();
-})
+  $(document).ready(function(){
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+      else {
+        $('#cash').text(localStorage.getItem("cash"));
+      }
+      update_balance();
+    })
 
-$(document).on('click', '.cashier_number', function(event){
-  if(event.handled !== true) {
+  $(document).on('click', '.cashier_number', function(event){
+    if(event.handled !== true) {
       var original_value;
       original_value = $('#cash').text();
 
@@ -293,79 +295,86 @@ $(document).on('click', '.cashier_number', function(event){
         }
         break;
         case 'add':
-          var input_value = $(this).attr("data-value");
-          amount = parseInt(input_value) + parseInt(original_value);
-          $('#cash').text(amount);
-          update_balance();
+        var input_value = $(this).attr("data-value");
+        amount = parseInt(input_value) + parseInt(original_value);
+        $('#cash').text(amount);
+        update_balance();
         break;
         case 'del' :
-          var cash=$('#cash').text();
-          if(cash.length == 1)
-            $('#cash').text("0.0");
-          else
-            $('#cash').text(cash.substr(0,cash.length-1));
-          update_balance();
+        var cash=$('#cash').text();
+        if(cash.length == 1)
+          $('#cash').text("0.0");
+        else
+          $('#cash').text(cash.substr(0,cash.length-1));
+        update_balance();
         break;
         case 'clr':
-           $('#cash').text("0.0");
-           update_balance();
+        $('#cash').text("0.0");
+        update_balance();
         break;
         case 'nett':
-          var credit1 = $('#credit').text();
-          var card1 = $('#others').text();
-          var paypar1 = $('#ppamount').text();
-          var visa1 = $('#visacount').text();
-          var jcb1 = $('#jcbcount').text();
-          var master1 = $('#mastercount').text();
-          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
-          var total = $('#amount_due').text();
-          var amt = parseFloat(total) - othertotal;
-          $('#cash').text(amt);
-          update_balance();
+        var credit1 = $('#credit').text();
+        var card1 = $('#others').text();
+        var paypar1 = $('#ppamount').text();
+        var visa1 = $('#visacount').text();
+        var jcb1 = $('#jcbcount').text();
+        var master1 = $('#mastercount').text();
+        var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
+        var total = $('#amount_due').text();
+        var amt = parseFloat(total) - othertotal;
+        $('#cash').text(amt);
+        update_balance();
         break;
-    }
+      }
       event.handled = true;
     } else {
-        return false;
+      return false;
     }
-});
+  });
 
-$( document ).ready(function() {
+  $( document ).ready(function() {
   // Disable click event cash to prevent
   $(".payment .cash-color").off('click');
 
   $('#credit_payment').click(function() {
     var sale_id = $('#sale_id').text();
-     window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
-     return false;
- });
+    window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
+    return false;
+  });
 
- $('#card_payment').click(function() {
+  $('#card_payment').click(function() {
    localStorage.setItem("cash",$('#cash').text() );
    var sale_id = $('#sale_id').text();
-    window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
-    return false;
+   window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
+   return false;
  });
 
- $('#pay').click(function() {
+  $('#pay').click(function() {
     $('#pay').text("Processing, Please wait!")
 
-      $( "#loading_wrapper" ).show();
+    $( "#loading_wrapper" ).show();
+
+    if($('#balance').text() > 0){
+      alert(" Insufficient Amount!")
+      $( "#loading_wrapper" ).hide();
+    }else{
+      var sale_id   = $('#sale_id').text();
+      var item_row  = $('.is_card');
+      if (item_row.length < 1) {
+        calculate_member_discount(sale_id);
+      }
 
-     if($('#balance').text() > 0){
-        alert(" Insufficient Amount!")
-        $( "#loading_wrapper" ).hide();
-     }else{
         //  payment
         var cash = $('#cash').text();
         var credit = $('#credit').text();
         var card = $('#card').text();
-        var sale_id = $('#sale_id').text();
         
         $.ajax({type: "POST",
           url: "<%= origami_payment_cash_path %>",
           data: "cash="+ cash + "&sale_id=" + sale_id,
+          async: false,
           success:function(result){
+
             localStorage.removeItem("cash");             
             if (result.status) {
               var msg = result.message;
@@ -380,24 +389,23 @@ $( document ).ready(function() {
                 content: 'Changed amount  ' + $('#balance').text() * (-1),
                 buttons: {
                   confirm: {
-                  text: 'Ok',
-                  btnClass: 'btn-green',
+                    text: 'Ok',
+                    btnClass: 'btn-green',
                     action: function(){
                       window.location.href = '/origami';
                     }
                   }
                 }
               });
-            }
-            else{         
+            }else{         
               $('#pay').text("Pay")
               $.confirm({
                 title: 'Infomation!',
                 content: 'Thank you !',
                 buttons: {
                   confirm: {
-                  text: 'Ok',
-                  btnClass: 'btn-green',
+                    text: 'Ok',
+                    btnClass: 'btn-green',
                     action: function(){
                       window.location.href = '/origami';
                     }
@@ -408,75 +416,91 @@ $( document ).ready(function() {
           }
         });
       }
- });
+    });
 
-$('#void').on('click',function () {
+  $('#void').on('click',function () {
     var sure = confirm("Are you sure want to Void");
     if (sure == true) {
-        var sale_id = $('#sale_id').text();
-        var ajax_url = "/origami/sale/" + sale_id + '/void';
-        $.ajax({
-            type: 'POST',
-            url: ajax_url,
-            success: function () {
-                window.location.href = '/origami/';
-            }
-        })
+      var sale_id = $('#sale_id').text();
+      var ajax_url = "/origami/sale/" + sale_id + '/void';
+      $.ajax({
+        type: 'POST',
+        url: ajax_url,
+        success: function () {
+          window.location.href = '/origami/';
+        }
+      })
     } else {
 
     }
-});
+  });
 
 });
 
-function update_balance(){
-  var cash = $('#cash').text();
-  var credit = $('#credit').text();
-  var card = $('#others').text();
-  var paypar = $('#ppamount').text();
-  var visa = $('#visacount').text();
-  var jcb = $('#jcbcount').text();
-  var master = $('#mastercount').text();
-  var amount_due = $('#amount_due').text();
-  var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
-  var result = amount_due - total;
-  $('#balance').text(result.toFixed(2));
-}
+  function update_balance(){
+    var cash = $('#cash').text();
+    var credit = $('#credit').text();
+    var card = $('#others').text();
+    var paypar = $('#ppamount').text();
+    var visa = $('#visacount').text();
+    var jcb = $('#jcbcount').text();
+    var master = $('#mastercount').text();
+    var amount_due = $('#amount_due').text();
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
+    var result = amount_due - total;
+    $('#balance').text(result.toFixed(2));
+  }
 
-$('#foc').click(function() {
-
-      $( "#loading_wrapper" ).show();
+  $('#foc').click(function() {
+    $( "#loading_wrapper" ).show();
         //  payment
         var cash = $('#amount_due').text();
         var sub_total = $('#sub-total').text();
         var sale_id = $('#sale_id').text();
         var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total };
+
         $.ajax({type: "POST",
           url: "<%= origami_payment_foc_path %>",
           data: params,
           success:function(result){          
-          
+
             $( "#loading_wrapper" ).hide();
             
-              if (cash > 0) {
-                $.confirm({
+            if (cash > 0) {
+              $.confirm({
                 title: 'Infomation!',
                 content: 'Thank you !',
                 buttons: {
                   confirm: {
-                  text: 'Ok',
-                  btnClass: 'btn-green',
+                    text: 'Ok',
+                    btnClass: 'btn-green',
                     action: function(){
                       window.location.href = '/origami';
                     }
                   }
                 }
               });
-              }
+            }
             
           }
         });
+  });
+  
+  function calculate_member_discount(sale_id) {
+   var sub_total = $('#sub-total').text();
+   var member_id = $('#membership_id').text();
+   var member_discount = $('#member_discount').text();
 
- });
+   if (member_id && member_discount) {
+    $.ajax({
+      type: "POST",
+      url: "/origami/" + sale_id + "/member_discount",
+      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
+      async: false,
+      success:function(result){ 
 
+      }
+    });
+  }
+}
 </script>
\ No newline at end of file
diff --git a/app/views/origami/product_commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb
index b0bb5e63..51653529 100644
--- a/app/views/origami/product_commissions/load_commissioners.html.erb
+++ b/app/views/origami/product_commissions/load_commissioners.html.erb
@@ -7,6 +7,7 @@
       </div>
       <div class="card-block">
         <div class="card-columns" id="commissioners" style="float: left; padding-top:10px; column-gap: 1.2rem; min-height:600px; max-height:600px; overflow-x:scroll;">
+          <div style="color: gray"><i>* Select One Item</i></div>
           <% @commissioners.each do |commissioner| %>
               <div class="card tables green text-white commissioner" data-commissioner-id="<%= commissioner.id %>" data-commissioner-name="<%= commissioner.name %>">
                 <div class="card-block">
@@ -77,7 +78,7 @@
                         <%= sale_item.qty %>
                       </td>
                       <td class='unit_price' width="20%">
-                        <%= sale_item.unit_price %>
+                        <%= sale_item.price %>
                       </td>
                       <td class='commissioner' width="20%">
                         <% product_commission = ProductCommission.find_by_sale_item_id(sale_item.id) %>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 673b733d..c4cd7505 100644
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -39,24 +39,25 @@
          <% @tables.each do |table| %>
          <% if table.status == 'occupied' %>
             <% if table.get_booking.nil? %>
-                <div class="card tables red text-white" data-id="<%= table.id %>">
+                <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
                   <div class="card-block">
                      <%= table.name %>
-                       <span class="pull-right font-12"> billed</span>
+                       <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                   </div>
                 </div>
             <% else %>
-                <div class="card tables blue text-white" data-id="<%= table.id %>">
+                <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
                   <div class="card-block">
                      <%= table.name %>
-                       <span class="pull-right font-12"> new</span>
+                       <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                   </div>
                 </div>
             <% end %>
          <% else %>
-         <div class="card tables green text-white" data-id="<%= table.id %>">
+         <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
            <div class="card-block">
               <%= table.name %>
+              <span class="pull-right font-12 new_text_<%= table.id %> hide">
            </div>
          </div>
          <% end %>
@@ -71,25 +72,26 @@
          <% if room.status == 'occupied' %>
 
            <% if room.get_booking.nil? %>
-               <div class="card rooms red text-white" data-id="<%= room.id %>">
+               <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                  <div class="card-block">
                     <%= room.name %>
-                    <span class="pull-right font-12"> billed</span>
+                    <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                     <div  style="font-size:12px;"></div>
                  </div>
                </div>
            <% else %>
-               <div class="card rooms blue text-white" data-id="<%= room.id %>">
+               <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                  <div class="card-block">
                     <%= room.name %>
-                    <span class="pull-right font-12"> new</span>
+                    <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                  </div>
                </div>
            <% end %>
          <% else %>
-         <div class="card rooms green text-white" data-id="<%= room.id %>">
+         <div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
            <div class="card-block">
               <%= room.name %>
+              <span class="pull-right font-12 new_text_<%= room.id %> hide">
            </div>
          </div>
          <% end %>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 1589ca1b..073b7e60 100644
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -7,160 +7,194 @@
 				<h2>VISA</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-									<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_visa %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% if @visacount != 0 %>
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">Recent Visa paid amount </label>
-									<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@visacount %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
-			</div>
-	</div>
-
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
-
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="visa_pay">Pay</div>
-           </div>
-         </div>
+    <span class="hidden" id="membership_id"><%= @membership_id%></span>
+    <span class="hidden" id="member_discount"><%= @member_discount%></span>
+    <span class="hidden" id="sub-total"><%= @sub_total%></span>
+    <div class="card" style="margin-top:10px;padding-top:20px;">
+      <div class="rebate-form">
+       <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+          <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_visa %>" data-member-value="">
+        </div>
+        <hr>
       </div>
-
+      <% if @visacount != 0 %>
+      <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">Recent Visa paid amount </label>
+          <input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@visacount %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% end %>
+      <div class="row">
+       <div class="form-group col-lg-12 col-md-12 col-sm-12">
+        <label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+      </div>
+      <hr>
     </div>
+    <div class="row">
+     <div class="form-group col-lg-12 col-md-12 col-sm-12">
+      <label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+      <div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+    </div>
+    <hr>
+  </div>
+</div>
+</div>
+</div>
 
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
-		</div>
+<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+
+ <div class="row">
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="1" data-type="num">1</div>
+       <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+       <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="4" data-type="num">4</div>
+       <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+       <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="7" data-type="num">7</div>
+       <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+       <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="0" data-type="num">0</div>
+       <div class=" cashier_number left" data-value="." data-type="num">.</div>
+       <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number green" data-type="nett" >Nett</div>
+       <div class=" cashier_number red left" data-type="del">Del</div>
+       <div class=" cashier_number orange left" data-type="clr">Clr</div>
+     </div>
+   </div>
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+       <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+     </div>
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+       <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+     </div>
+     <div class="row bottom">
+       <div class="pay purple" id="visa_pay">Pay</div>
+     </div>
+   </div>
+ </div>
+
+</div>
+
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+</div>
 </div>
 
 <script>
-$(document).ready(function() {
-		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
-$(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+  $(document).ready(function() {
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+     else {
+       $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
+     }
+   });
+  $(document).on('click', '.cashier_number', function(event){
+    event.stopPropagation();
+    event.preventDefault();
+    if(event.handled !== true) {
+      var original_value;
+      original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+      var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+      var input_type = $(this).attr("data-type");
+      switch (input_type) {
+        case 'num':
+        if (original_value == "0.0"){
+         $('#amount').text(input_value);
+       }else{
+         $('#amount').append(input_value);
+       }
+       break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+       case 'add':
+       var input_value = $(this).attr("data-value");
+       amount = parseInt(input_value) + parseInt(original_value);
+       $('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+       break;
+       case 'clr':
+       $('#amount').html("0.0");
+       break;
+       case 'del' :
+       var cash=$('#amount').text();
+       $('#amount').text(cash.substr(0,cash.length-1));
+       break;
+       case 'nett':
+       var remain_amount = $('#validamount').val();
+       $('#amount').text(remain_amount);
+       break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
+     }
+     event.handled = true;
+   } else {
+    return false;
+  }
 });
   $('#visa_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value"))){
-    $.ajax({type: "POST",
-      url: "<%= origami_payment_visa_path  %>",
-      data: "amount="+ amount + "&sale_id="+ sale_id,
-      success:function(result){
-        if(result){
-          alert("Payment success")
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-       }
+    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value"))){
+      //start member discount 5% by pay card  
+      var sub_total = $('#sub-total').text();
+      var member_id = $('#membership_id').text();
+      var member_discount = $('#member_discount').text();
+      if (member_id && member_discount) {
+        $.ajax({
+          type: "POST",
+          url: "/origami/" + sale_id + "/member_discount",
+          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
+                // success:function(result){           
+                // }
+        });
       }
-    });
-	}else{
-		alert("Paid Amount is over!");
-	}
+      //end member discount
+      $.ajax({type: "POST",
+        url: "<%= origami_payment_visa_path  %>",
+        data: "amount="+ amount + "&sale_id="+ sale_id,
+        success:function(result){
+          if(result){
+            $.confirm({
+                  title: 'Infomation!',
+                  content: 'Payment Successfully',
+                  buttons: {
+                    confirm: {
+                    text: 'Ok',
+                    btnClass: 'btn-green',
+                      action: function(){
+                        window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                      }
+                    }
+                  }
+                });
+          }
+        }
+      });
+    }else{
+      $.alert({
+        title: 'Alert!',
+        content: "Paid Amount is over!",
+        type: 'red',
+        typeAnimated: true,
+        btnClass: 'btn-danger',
+      });
+    }
   })
 </script>
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 4715b00c..749a62fc 100644
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -29,6 +29,8 @@
           <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
         </tr>
         <tr>
+          <th>Sale</th>
+          <th>Sale Item</th>
           <th>Commissioner Name</th>
           <th>Product Name</th>
           <th>Qty</th>
@@ -44,12 +46,10 @@
 
         <% @transaction.each do |result| %>
             <tr>
-              <td>
-                <%= result.commissioner.name rescue '-' %>
-              </td>
-              <td>
-                <%= result.commission.menu_item.name rescue '-' %>
-              </td>
+              <td><%= result.sale_id rescue '-' %></td>
+              <td><%= result.sale_item_id rescue '-' %></td>
+              <td><%= result.commissioner.name rescue '-' %></td>
+              <td><%= result.commission.menu_item.name rescue '-' %></td>
               <td><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %></td>
               <td><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %></td>
               <td><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %></td>
@@ -61,7 +61,7 @@
         <% end %>
 
         <tr style="border-top: 3px solid grey;">
-          <td colspan="2"></td>
+          <td colspan="4"></td>
           <td><b><%= sprintf("%.2f", total_qty) rescue '-' %></b></td>
           <td><b><%= sprintf("%.2f", total_price) rescue '-' %></b></td>
           <td><b><%= sprintf("%.2f", total_amount) rescue '-' %></b></td>
diff --git a/app/views/reports/stock_check/_stock_check_report_filter.html.erb b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
new file mode 100644
index 00000000..1bd00b7b
--- /dev/null
+++ b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
@@ -0,0 +1,89 @@
+<div class="row">
+  <div class="col-md-12">
+    <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
+        <% if period_type != false %>
+            <div class="row">
+
+              <div class="form-group col-md-3">
+                <label class="">Select Date Range</label>
+                <% if @daterange %>
+                    <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
+                <% else %>
+                    <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
+                <% end %>
+              </div>
+              <div class="form-group col-md-4">
+                <label class="">Definition Item</label>
+                <select class="form-control" name="item_code" id="item_code">
+                  <option value="">Select Product</option>
+                  <% @inventory_definitions.each do |id| %>
+                      <option value="<%= id.item_code %>">
+                        <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                        <% if menu_item.nil? %>
+                            <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                        <% else %>
+                            <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                        <% end %>
+                      </option>
+                  <% end %>
+                </select>
+              </div>
+              <div class="form-group col-md-2 margin-top-20">
+                <input type="submit" value="Generate Report" class='btn btn-primary'>
+              </div>
+              <div class="form-group col-md-2 margin-top-20">
+                <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
+              </div>
+            </div>
+        <% end %>
+
+    <% end %>
+  </div>
+</div>
+
+<script type="text/javascript">
+
+    $(document).ready(function () {
+
+        $('#item_code').select2({
+            placeholder: 'Select Product',
+            allowClear: true
+        });
+
+        $('#clear_filter').click(function () {
+            $('#daterange').val('');
+            $('#item_code').val('').text('');
+        });
+
+        $('input[name="daterange"]').daterangepicker({
+                autoUpdateInput: false,
+                ranges: {
+                    'Today': [moment(), moment()],
+                    'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                    'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                    'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                    'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+                },
+                locale: {
+                    format: 'YYYY-MM-DD'
+                }
+            },
+            function (start, end, label) {
+                $('input[name="daterange"]').val(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
+            });
+
+        $('input[name="daterange"]').on('apply.daterangepicker', function (ev, picker) {
+            $('input[name="daterange"]').val(picker.startDate.format('YYYY-MM-DD') + ' - ' + picker.endDate.format('YYYY-MM-DD'));
+
+            from_date = picker.startDate.format('YYYY-MM-DD 00:00:00');
+            to_date = picker.endDate.format('YYYY-MM-DD 23:59:59');
+        });
+
+        $('input[name="daterange"]').on('cancel.daterangepicker', function (ev, picker) {
+            $('input[name="daterange"]').val('');
+        });
+
+    });
+
+</script>
diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb
new file mode 100644
index 00000000..2a231fef
--- /dev/null
+++ b/app/views/reports/stock_check/index.html.erb
@@ -0,0 +1,87 @@
+<div class="page-header">
+  <ul class="breadcrumb">
+    <li><a href="<%= dashboard_path %>">Home</a></li>
+    <li>Stock Check Report</li>
+  </ul>
+</div>
+
+<div class="container">
+  <%= render :partial => 'stock_check_report_filter',
+             :locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %>
+  <hr/>
+</div>
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-12 text-right">
+      <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-default">Export to
+        Excel</a>
+    </div>
+  </div>
+</div>
+
+<div class="container margin-top-20">
+  <div class="card row">
+    <div class="table-responsive">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <th colspan="8"><i> From Date </i>: <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <i>To Date</i> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
+        </tr>
+        <tr>
+          <th>Stock Check Reason</th>
+          <th>Checked By</th>
+          <th>Item Name</th>
+          <th>Stock Count</th>
+          <th>Stock Balance</th>
+          <th>Different</th>
+          <th>Remark</th>
+          <th>Date</th>
+        </tr>
+        </thead>
+        <tbody>
+        <% total_stock_count = 0 %>
+        <% total_stock_balance = 0 %>
+        <% total_different = 0 %>
+
+        <% @transaction.each do |result| %>
+            <tr>
+              <td><%= result.stock_check.reason rescue '-' %></td>
+              <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
+              <td>
+                <% menu_item = MenuItemInstance.find_by_item_instance_code(result.item_code)%>
+                <% if menu_item.nil? %>
+                    <%= Product.find_by_item_code(result.item_code).name rescue "-" %>
+                <% else %>
+                    <%= menu_item.menu_item.name rescue "-" %>
+                    - <%= menu_item.item_instance_name rescue "-" %>
+                <% end %>
+              </td>
+              <td><%= result.stock_count rescue '-' %></td>
+              <td><%= result.stock_balance rescue '-' %></td>
+              <td><%= result.different rescue '-' %></td>
+              <td><%= result.remark rescue '-' %></td>
+              <td><%= result.created_at.strftime('%e %b %Y %I:%M %p') rescue '-' %></td>
+            </tr>
+            <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
+            <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>
+            <% !result.different.nil? ? total_different += result.different : total_different += 0 %>
+        <% end %>
+
+        <tr style="border-top: 3px solid grey;">
+          <td colspan="3"></td>
+          <td><b><%= total_stock_count rescue '-' %></b></td>
+          <td><b><%= total_stock_balance rescue '-' %></b></td>
+          <td><b><%= total_different rescue '-' %></b></td>
+          <td colspan="2"></td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+<script>
+    $(function () {
+
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/reports/stock_check/index.xls.erb b/app/views/reports/stock_check/index.xls.erb
new file mode 100644
index 00000000..4ea1f2f0
--- /dev/null
+++ b/app/views/reports/stock_check/index.xls.erb
@@ -0,0 +1,52 @@
+<div class="container margin-top-20">
+  <div class="card row">
+    <div class="table-responsive">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
+        </tr>
+        <tr>
+          <th>Commissioner Name</th>
+          <th>Product Name</th>
+          <th>Qty</th>
+          <th>Commission Price</th>
+          <th>Commission Amount</th>
+          <th>Date</th>
+        </tr>
+        </thead>
+        <tbody>
+        <% total_qty = 0 %>
+        <% total_price = 0 %>
+        <% total_amount = 0 %>
+
+        <% @transaction.each do |result| %>
+            <tr>
+              <td>
+                <%= result.commissioner.name rescue '-' %>
+              </td>
+              <td>
+                <%= result.commission.menu_item.name rescue '-' %>
+              </td>
+              <td><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %></td>
+              <td><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %></td>
+              <td><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %></td>
+              <td><%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %></td>
+            </tr>
+            <% total_qty += result.qty.to_f %>
+            <% total_price += result.price.to_f %>
+            <% total_amount += result.amount.to_f %>
+        <% end %>
+
+        <tr style="border-top: 3px solid grey;">
+          <td colspan="2"></td>
+          <td><b><%= sprintf("%.2f", total_qty) rescue '-' %></b></td>
+          <td><b><%= sprintf("%.2f", total_price) rescue '-' %></b></td>
+          <td><b><%= sprintf("%.2f", total_amount) rescue '-' %></b></td>
+          <td></td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb
index 2ec9c115..30422fd1 100644
--- a/app/views/settings/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -8,7 +8,7 @@
     <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
     <%= f.input :amount %>
     <label><%= f.check_box :is_active %> Active </label>
-    
+
   </div><br>
   <div class="form-actions">
     <%= link_to 'Back', settings_commissions_path, class: 'btn btn-success' %>
diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb
index 5cc25062..0138a774 100644
--- a/app/views/settings/dining_charges/_form.html.erb
+++ b/app/views/settings/dining_charges/_form.html.erb
@@ -8,7 +8,7 @@
     <%= f.input :charge_type, :collection => [:hr, :day] %>
     <%= f.input :minimum_free_time %>
     <%= f.input :charge_block, :input_html => { :id => 'charge_block'} %>
-    <%= f.input :time_rounding %>
+    <%= f.input :time_rounding, :collection => [:down, :up] %>
     <%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %>
     <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price'} %>
   </div>
diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb
index d5884474..d82b8486 100644
--- a/app/views/settings/menu_item_instances/edit.html.erb
+++ b/app/views/settings/menu_item_instances/edit.html.erb
@@ -12,5 +12,26 @@
 		 </ul>
 		</div>
     <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
-
 </div>
+
+
+<script type="text/javascript">
+$(function(){
+	// auto selected after loaded
+	<% 
+		@settings_menu_item_instances.item_sets.each do |set|
+	%>
+	$("#menu_item_instance_item_sets option[value='" + <%= set.id %> + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'});
+	<% 
+		end
+	%>
+
+	// After loaded
+	$("#menu_item_instance_item_sets").on('click', 'option', function(e){
+		if($(this).attr("selected")){
+			$(this).removeAttr("selected");
+			$(this).css({'color':'#000','background':'#fff'});
+		}
+	});
+});
+</script>
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index bea1f981..1760f894 100644
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -39,18 +39,19 @@
             <% end %>
           </div>
         </div>
-
+        <br>
         <div class="row checkboxes">
-         <%= f.hidden_field :promo_day, :value => "", :class => "form-control col-md-1" %> 
-          <div class="col-md-1"><input class="select" type="checkbox" name="Sunday" value="0" id="0"> Sun</div>
-          <div class="col-md-1"><input class="select" type="checkbox" name="Monday" value="1" id="1">Mon</div>
-          <div class="col-md-1"><input class="select" type="checkbox" name="Tuesday" value="2" id="2"> Tue</div>
-          <div class="col-md-1"><input class="select" type="checkbox" name="Wednesday" value="3" id="3"> Wed</div>
-          <div class="col-md-1"><input class="select" type="checkbox" name="Thursday" value="4" id="4">Thu</div>
-          <div class="col-md-1"><input class="select" type="checkbox" name="Friday" value="5" id="5">Fri</div>
-          <div class="col-md-1"><input class="select" type="checkbox" name="Saturday" value="6" id="6">Sat</div>
+         <div class="col-md-2"><label class="control-label"><abbr title="required">*</abbr>  Promotion Day</label></div>
+         <%= f.hidden_field :promo_day, :class => "form-control" %>
+          <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Sunday" value="0" id="0"> Sun</label></div>
+          <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Monday" value="1" id="1">Mon</label></div>
+          <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Tuesday" value="2" id="2"> Tue</label></div>
+          <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Wednesday" value="3" id="3"> Wed</label></div>
+          <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Thursday" value="4" id="4"> Thu</label></div>
+          <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Friday" value="5" id="5"> Fri</label></div>
+          <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label></div>
         </div>
-      
+        <br>
         <div class="row">
           <div class="col-md-6">
             <%= f.input :promo_type,input_html: { class: "" },
@@ -73,11 +74,12 @@
                   <% code = menuiteminstance.menu_item.item_code %>
                 <% end %>
               <% end %>
+              <option value="" selected>Choose Something</option>
               <% arr.each do |a| %>
                 <% if a[1] == code %>
                   <option value="<%= a[1]%>" selected><%= a[0]  %></option>
                 <% else %>
-                  <option value="<%= a[1]%>"><%= a[0]  %></option>
+                  <option value="<%= a[1]%>"><%= a[0] %></option>
                 <% end %>
               <% end %>
             </select>
@@ -109,19 +111,23 @@
               <div class="row"></div >
               <%= f.fields_for :promotion_products do |pro| %>
               <div class="row">
+                <%= pro.hidden_field :item_code,:class => "promo_product" %>
                 <% arr =  MenuItem.active.order("name desc").pluck(:name,:item_code) %>
                 <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
                   <% arr.push(p) %>
                 <% end %>
-                <div class="col-md-2" style="text-align:left">
+                <div class="col-md-2 menu_item_choose" style="text-align:left">
                   <select class="form-control item_code_place1">
+                    <option value="">Choose Something</option>
                     <% arr.each do |a| %>
-                      <option value="<%= a[1 ]%>"><%= a[0]  %></option>
+                      <option value="<%= a[1 ]%>"><%= a[0] %></option>
                     <% end %>
                   </select>
                 </div>
-                <% sample = [] %>
-                <div class="col-md-2" style="text-align:left"><%= pro.input :item_code, :class => 'promoproduct', collection: sample,input_html: { selected: 2 }, label: false %></div>
+                <!-- <% sample = [] %> -->
+
+                <div class="col-md-2" style="text-align:left"><%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %></div>
+
                 <div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
                 <div class="col-md-2"><%= pro.input :net_off , label: false %></div>
                 <div class="col-md-2"><%= pro.input :net_price , label: false %></div>
@@ -156,23 +162,33 @@ $(document).ready(function(){
   $('#promotion_promo_start_hour').datetimepicker({
     datepicker:false,
     format:'H:m'
-  });
+        });
   $('#promotion_promo_end_hour').datetimepicker({
     datepicker:false,
     format:'H:m'
   });
 
+  $('#promotion_promo_start_hour').on('change', function(event) {
+    $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");
+  });
 
+  $('#promotion_promo_end_hour').on('change', function(event) {
+    $('#promotion_promo_end_hour').val($('#promotion_promo_end_hour').val().split(":")[0]+":00");
+  });
 
+  var dayy = $("#promotion_promo_day").val().replace("[","").replace("]","");
+  jQuery.each( dayy.split(","), function( i, d ) {
+    $("input.selectDay[value='"+d+"']").prop( "checked", true );
+  });
 
   var form = document.getElementById("new_promotion");
-  var inputs = form.getElementsByTagName("input");
+  var inputs = $("input");
   var arr = [];
   var count = 0;
   var day = "[";
- 
-$(".select").click(function() {
-    
+
+$(".selectDay").click(function() {
+
       // debugger;
       day = "[";
       for (var j = 8; j <=15; j += 1){
@@ -192,12 +208,12 @@ $(".select").click(function() {
        }
       document.getElementById("promotion_promo_day").value = '';
       document.getElementById("promotion_promo_day").value = day;
-  }); 
-     
+  });
+
   $("#promotion_original_product").select2();
   $(".item_code_place").select2();
   $(".item_code_place").on('change', function(event) {
-    var ajax_url = "<%= settings_find_item_instance_path	 %>";
+    var ajax_url = "<%= settings_find_item_instance_path %>";
     var item_code =  this.value;
     $.ajax({
         type: "GET",
@@ -223,6 +239,29 @@ $(".select").click(function() {
       callforpromoproduct();
     }, 0);
   });
+
+  // for promotion products data showing
+  var promopdt = $(".promo_product");
+  jQuery.each( promopdt, function( i, ppdt ) {
+        var ajax_url = "<%= settings_find_parent_item_path	%>";
+        var item_code =  ppdt.value;
+        var select_id =  ppdt.id;
+        $.ajax({
+            type: "GET",
+            url: ajax_url,
+            data: 'item_instance_code=' + item_code,
+            success: function (result) {
+                if(result.length > 0){
+                  $("select#"+select_id).empty();
+                  $("select#"+select_id).append("<option value='"+item_code+"'>"+result[0]+"</option>");
+                  $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").find("option[value='"+result[1]+"']").attr("selected","true")
+                  $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").select2();
+                }
+            }
+        });
+  });
+
+  // promotion_promotion_products_attributes_0_item_code
   function callforpromoproduct(){
     $(".item_code_place1").select2();
     $(".item_code_place1").on('change', function(event) {
@@ -234,16 +273,17 @@ $(".select").click(function() {
           url: ajax_url,
           data: 'item_code=' + item_code,
           success: function (result) {
-              $("#"+id).empty();
+              $("select#"+id).empty();
               var itemlist;
               for (var i = 0; i < result.length; i++) {
                 itemlist += "<option value ="+result[i][1]+">"+result[i][0]+"</option>"
               }
-              $("#"+id).append(itemlist);
-              $("#"+id).select2();
+              $("select#"+id).append(itemlist);
+              $("select#"+id).select2();
           }
       });
     });
   }
+
 });
 </script>
diff --git a/config/cable.yml b/config/cable.yml
index 0bbde6f7..a383c5af 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -1,9 +1,7 @@
-development:
-  adapter: async
-
-test:
-  adapter: async
-
-production:
+redis: &redis
   adapter: redis
   url: redis://localhost:6379/1
+
+production: *redis
+development: *redis
+test: *redis
\ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4d8fc580..4c681ee6 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -45,6 +45,8 @@ Rails.application.configure do
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
+  config.web_console.whiny_requests = false
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
@@ -53,5 +55,5 @@ Rails.application.configure do
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   # Set Cable URL
-  # config.action_cable.url = "ws://192.168.1.140:3002/cable"
+   config.action_cable.url = "ws://192.168.1.39:3002/cable"
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index bcb83367..3b43f5ea 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -36,3 +36,7 @@ Rails.application.config.assets.precompile += %w( fileinput.min.js )
 # --- Customer/ Customer - Crm ----
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
+
+# --- Inventory Definition ----
+Rails.application.config.assets.precompile += %w( inventory_definitions.css )
+
diff --git a/config/routes.rb b/config/routes.rb
index 65b7ab8a..70accbb2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,7 @@ Rails.application.routes.draw do
   mount Sidekiq::Web => '/kiq'
 
   # Action Cable Creation
-  # mount ActionCable.server => "/cable"
+   mount ActionCable.server => "/cable"
 
   #--------- SmartSales Installation ------------#
   get 'install' => 'install#index'
@@ -33,7 +33,7 @@ Rails.application.routes.draw do
       resources :menu, only: [:index, :show]
       resources :menu_categories, only: [:index, :show]
       resources :menu_items, only: [:index, :show]
-      resources :menu_item_attributes, only: [:index]
+      resources :menu_item_attributes, only: [:index, :show]
       resources :menu_item_options, only: [:index]
       resources :menu_sold_out, only: [:index]
       resources :menu_item_instances, only: [:show]
@@ -88,14 +88,14 @@ Rails.application.routes.draw do
     post 'item_void_cancel' => "sale_edit#item_void_cancel"
     post 'cancel_all_void' => 'sale_edit#cancel_all_void'
     post 'apply_void' => 'sale_edit#apply_void'
-    # in_juties
-    get '/table/:table_id/assign_in_juty' => 'in_juties#assign_in_juty', as: 'assign_in_juty'
-    get 'assign_in_juty/:table_id' => 'in_juties#index_in_juty', as: 'index_in_juty'
-    post 'assign_in_juty/:table_id' => 'in_juties#create_for_in_juty'
+    # in_duties
+    get '/table/:table_id/assign_in_duty' => 'in_duties#assign_in_duty', as: 'assign_in_duty'
+    get 'assign_in_duty/:table_id' => 'in_duties#index_in_duty', as: 'index_in_duty'
+    post 'assign_in_duty/:table_id' => 'in_duties#create_for_in_duty'
 
-    get 'assign_in_juty/table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty'
-    patch 'edit_in_juty/:id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty'
-    delete 'table/:table_id/destroy_in_juty/:id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty'
+    get 'assign_in_duty/table/:table_id/in_duty/:id/edit' => 'in_duties#edit_in_duty' ,as: 'edit_in_duty'
+    patch 'edit_in_duty/:id' => 'in_duties#update_for_in_duty', as: 'update_for_in_duty'
+    delete 'table/:table_id/destroy_in_duty/:id' => 'in_duties#destroy_in_duty', as: 'destroy_in_duty'
 
     get 'table/:dining_id/movetable' => "movetable#move_dining"
     get 'table/:dining_id/moveroom' => "moveroom#move_dining"
@@ -178,13 +178,15 @@ Rails.application.routes.draw do
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 
-     get '/:addorders/:id' => "addorders#detail"
-     post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
+    get '/:addorders/:id' => "addorders#detail"
+    post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
 
     resources :commissions
     resources :commissioners
 
-    resources :in_juties
+    resources :addorders
+    resources :in_duties
 
     # product_commission
     get 'table/:table_id/sale/:sale_id/load_commissioners' => 'product_commissions#load_commissioners', as: 'load_commissioners'
@@ -305,6 +307,7 @@ Rails.application.routes.draw do
       resources :promotion_products
     end
     get '/find_item_instance' => 'promotions#find_item_instance', as:'find_item_instance'
+    get '/find_parent_item' => 'promotions#find_parent_item', as:'find_parent_item'
 
     # commission
     resources :commissions
@@ -335,6 +338,7 @@ Rails.application.routes.draw do
     resources :credit_payment, :only => [:index, :show]
     resources :void_sale, :only => [:index, :show]
     resources :commission, :only => [:index, :show]
+    resources :stock_check, :only => [:index, :show]
 
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
   end
diff --git a/db/migrate/20170403161857_create_sale_items.rb b/db/migrate/20170403161857_create_sale_items.rb
index d42b6f3c..27cf7ac4 100644
--- a/db/migrate/20170403161857_create_sale_items.rb
+++ b/db/migrate/20170403161857_create_sale_items.rb
@@ -4,6 +4,7 @@ class CreateSaleItems < ActiveRecord::Migration[5.1]
       t.string :sale_item_id, :limit => 16, :primary_key => true#custom primary key - to ensure consistence for cloud syncing
       t.string :sale_id, foreign_key: true, :limit => 16
       t.string :product_code, :null => false
+      t.string :item_instance_code
       t.string :product_name, :null => false
       t.string :product_alt_name, :null => false
       t.integer :account_id, :limit => 8, :null => false, :default => 1
diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb
index 27b2305e..2d2f68ad 100644
--- a/db/migrate/20170530072247_create_shops.rb
+++ b/db/migrate/20170530072247_create_shops.rb
@@ -20,7 +20,7 @@ class CreateShops < ActiveRecord::Migration[5.1]
       t.string :id_prefix, :null => false, :limit => 3
       t.boolean :is_rounding_adj, :default => false
       t.boolean :quick_sale_summary, :default => false
-
+      t.boolean :calc_tax_order, :default => false
       t.timestamps
     end
   end
diff --git a/db/migrate/20170823081747_create_in_juties.rb b/db/migrate/20170823081748_create_in_duties.rb
similarity index 54%
rename from db/migrate/20170823081747_create_in_juties.rb
rename to db/migrate/20170823081748_create_in_duties.rb
index 15e48483..ca6d15b2 100644
--- a/db/migrate/20170823081747_create_in_juties.rb
+++ b/db/migrate/20170823081748_create_in_duties.rb
@@ -1,7 +1,9 @@
-class CreateInJuties < ActiveRecord::Migration[5.1]
+class CreateInDuties < ActiveRecord::Migration[5.1]
   def change
-    create_table :in_juties do |t|
+    create_table :in_duties do |t|
       t.integer :dinning_id
+      t.string :booking_id
+      t.string :sale_id
       t.json :commissioner_ids
       t.datetime :in_time
       t.datetime :out_time
diff --git a/dump.rdb b/dump.rdb
index 29aafb9ab913e1ac292d9318acde28e4749120a9..7d7b359cf467d72ccdedbb6c289ac7f4a3c49f3d 100644
GIT binary patch
delta 97
zcmcc2*26x*KqB$(ipXCarNyZ!y1A*jhZZ~%W%$SNTa<C)2a%02e2fz>i?dkj8W>J|
zCkCb`XD}XNDPOSAdb0r&C!>szp{aq1k+FrPiJ_jkp@oIHiP8Vrt76)wFK3(%0Oiji
A+5i9m

delta 88
zcmV-e0H^<q2h#?SFc^mPr&;<4b#rB8Ep26O!XWDy0R8~`69JRa0T;1f3jvd%0m2Ca
u1Qa-40RR95ldS<HlaK=78W1rxFf=hYIWsajE;KYUGBW>1??rC9FH-?{qa6zX

diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/public/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..1413fc609ab6f21774de0cb7e01360095584f65b
GIT binary patch
literal 45404
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

literal 0
HcmV?d00001

diff --git a/public/fonts/glyphicons-halflings-regular.woff b/public/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..9e612858f802245ddcbf59788a0db942224bab35
GIT binary patch
literal 23424
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
G`u_lkUM?>H

literal 0
HcmV?d00001

diff --git a/spec/controllers/origami/in_juties_controller_spec.rb b/spec/controllers/origami/in_duties_controller_spec.rb
similarity index 97%
rename from spec/controllers/origami/in_juties_controller_spec.rb
rename to spec/controllers/origami/in_duties_controller_spec.rb
index ac4dfe63..1d5c466b 100644
--- a/spec/controllers/origami/in_juties_controller_spec.rb
+++ b/spec/controllers/origami/in_duties_controller_spec.rb
@@ -23,7 +23,7 @@ require 'rails_helper'
 # removed from Rails core in Rails 5, but can be added back in via the
 # `rails-controller-testing` gem.
 
-RSpec.describe Origami::InJutiesController, type: :controller do
+RSpec.describe Origami::InDutiesController, type: :controller do
 
   # This should return the minimal set of attributes required to create a valid
   # InJuty. As you add validations to InJuty, be sure to
@@ -38,7 +38,7 @@ RSpec.describe Origami::InJutiesController, type: :controller do
 
   # This should return the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
-  # Origami::InJutiesController. Be sure to keep this updated too.
+  # Origami::InDutiesController. Be sure to keep this updated too.
   let(:valid_session) { {} }
 
   describe "GET #index" do
diff --git a/spec/models/in_juty_spec.rb b/spec/models/in_duty_spec.rb
similarity index 68%
rename from spec/models/in_juty_spec.rb
rename to spec/models/in_duty_spec.rb
index 163b6534..b3015536 100644
--- a/spec/models/in_juty_spec.rb
+++ b/spec/models/in_duty_spec.rb
@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-RSpec.describe InJuty, type: :model do
+RSpec.describe InDuty, type: :model do
   pending "add some examples to (or delete) #{__FILE__}"
 end

From 7f5ce4e233b655643b9b45f20947162a2de8088c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 26 Sep 2017 11:40:44 +0630
Subject: [PATCH 03/18] update ui desige for sx theme

---
 app/assets/javascripts/application.js         |   2 +
 app/assets/javascripts/popper.min.js          |   5 +
 app/assets/stylesheets/sx-sidebar.css         | 172 +++++++++
 app/views/home/dashboard.html.erb             | 361 +++++++++---------
 app/views/layouts/_header.html.erb            |  25 +-
 app/views/layouts/_sidebar.html.erb           |  85 +++++
 app/views/layouts/application.html.erb        |  12 +-
 .../_commission_report_filter.html.erb        |  69 ++--
 app/views/reports/commission/index.html.erb   |  20 +-
 .../_shift_sale_report_filter.html.erb        | 206 +++++-----
 .../reports/credit_payment/index.html.erb     |  18 +-
 .../_shift_sale_report_filter.html.erb        | 250 ++++++------
 app/views/reports/dailysale/index.html.erb    | 287 +++++++-------
 .../_shift_sale_report_filter.html.erb        | 215 +++++------
 app/views/reports/receipt_no/index.html.erb   | 222 +++++------
 .../_shift_sale_report_filter.html.erb        |   6 +-
 app/views/reports/saleitem/index.html.erb     | 336 ++++++++--------
 .../_shift_sale_report_filter.html.erb        | 156 ++++----
 app/views/reports/shiftsale/index.html.erb    | 184 ++++-----
 .../_stock_check_report_filter.html.erb       |   6 +-
 app/views/reports/stock_check/index.html.erb  | 152 ++++----
 .../_shift_sale_report_filter.html.erb        | 205 +++++-----
 app/views/reports/void_sale/index.html.erb    | 188 +++++----
 config/initializers/assets.rb                 |   4 +
 24 files changed, 1726 insertions(+), 1460 deletions(-)
 create mode 100644 app/assets/javascripts/popper.min.js
 create mode 100644 app/assets/stylesheets/sx-sidebar.css
 create mode 100644 app/views/layouts/_sidebar.html.erb

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 77dbb850..518265d3 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -45,3 +45,5 @@ function export_to(path)
   var form_params = $("#frm_report").serialize();
   window.location = path+"?"+ form_params;
 }
+
+
diff --git a/app/assets/javascripts/popper.min.js b/app/assets/javascripts/popper.min.js
new file mode 100644
index 00000000..95e9ef5a
--- /dev/null
+++ b/app/assets/javascripts/popper.min.js
@@ -0,0 +1,5 @@
+/*
+ Copyright (C) Federico Zivolo 2017
+ Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT).
+ */(function(e,t){'object'==typeof exports&&'undefined'!=typeof module?module.exports=t():'function'==typeof define&&define.amd?define(t):e.Popper=t()})(this,function(){'use strict';function e(e){return e&&'[object Function]'==={}.toString.call(e)}function t(e,t){if(1!==e.nodeType)return[];var o=window.getComputedStyle(e,null);return t?o[t]:o}function o(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function n(e){if(!e||-1!==['HTML','BODY','#document'].indexOf(e.nodeName))return window.document.body;var i=t(e),r=i.overflow,p=i.overflowX,s=i.overflowY;return /(auto|scroll)/.test(r+s+p)?e:n(o(e))}function r(e){var o=e&&e.offsetParent,i=o&&o.nodeName;return i&&'BODY'!==i&&'HTML'!==i?-1!==['TD','TABLE'].indexOf(o.nodeName)&&'static'===t(o,'position')?r(o):o:window.document.documentElement}function p(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||r(e.firstElementChild)===e)}function s(e){return null===e.parentNode?e:s(e.parentNode)}function d(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return window.document.documentElement;var o=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,i=o?e:t,n=o?t:e,a=document.createRange();a.setStart(i,0),a.setEnd(n,0);var f=a.commonAncestorContainer;if(e!==f&&t!==f||i.contains(n))return p(f)?f:r(f);var l=s(e);return l.host?d(l.host,t):d(e,s(t).host)}function a(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:'top',o='top'===t?'scrollTop':'scrollLeft',i=e.nodeName;if('BODY'===i||'HTML'===i){var n=window.document.documentElement,r=window.document.scrollingElement||n;return r[o]}return e[o]}function f(e,t){var o=2<arguments.length&&void 0!==arguments[2]&&arguments[2],i=a(t,'top'),n=a(t,'left'),r=o?-1:1;return e.top+=i*r,e.bottom+=i*r,e.left+=n*r,e.right+=n*r,e}function l(e,t){var o='x'===t?'Left':'Top',i='Left'==o?'Right':'Bottom';return+e['border'+o+'Width'].split('px')[0]+ +e['border'+i+'Width'].split('px')[0]}function m(e,t,o,i){return _(t['offset'+e],o['client'+e],o['offset'+e],ie()?o['offset'+e]+i['margin'+('Height'===e?'Top':'Left')]+i['margin'+('Height'===e?'Bottom':'Right')]:0)}function h(){var e=window.document.body,t=window.document.documentElement,o=ie()&&window.getComputedStyle(t);return{height:m('Height',e,t,o),width:m('Width',e,t,o)}}function c(e){return se({},e,{right:e.left+e.width,bottom:e.top+e.height})}function g(e){var o={};if(ie())try{o=e.getBoundingClientRect();var i=a(e,'top'),n=a(e,'left');o.top+=i,o.left+=n,o.bottom+=i,o.right+=n}catch(e){}else o=e.getBoundingClientRect();var r={left:o.left,top:o.top,width:o.right-o.left,height:o.bottom-o.top},p='HTML'===e.nodeName?h():{},s=p.width||e.clientWidth||r.right-r.left,d=p.height||e.clientHeight||r.bottom-r.top,f=e.offsetWidth-s,m=e.offsetHeight-d;if(f||m){var g=t(e);f-=l(g,'x'),m-=l(g,'y'),r.width-=f,r.height-=m}return c(r)}function u(e,o){var i=ie(),r='HTML'===o.nodeName,p=g(e),s=g(o),d=n(e),a=t(o),l=+a.borderTopWidth.split('px')[0],m=+a.borderLeftWidth.split('px')[0],h=c({top:p.top-s.top-l,left:p.left-s.left-m,width:p.width,height:p.height});if(h.marginTop=0,h.marginLeft=0,!i&&r){var u=+a.marginTop.split('px')[0],b=+a.marginLeft.split('px')[0];h.top-=l-u,h.bottom-=l-u,h.left-=m-b,h.right-=m-b,h.marginTop=u,h.marginLeft=b}return(i?o.contains(d):o===d&&'BODY'!==d.nodeName)&&(h=f(h,o)),h}function b(e){var t=window.document.documentElement,o=u(e,t),i=_(t.clientWidth,window.innerWidth||0),n=_(t.clientHeight,window.innerHeight||0),r=a(t),p=a(t,'left'),s={top:r-o.top+o.marginTop,left:p-o.left+o.marginLeft,width:i,height:n};return c(s)}function y(e){var i=e.nodeName;return'BODY'===i||'HTML'===i?!1:'fixed'===t(e,'position')||y(o(e))}function w(e,t,i,r){var p={top:0,left:0},s=d(e,t);if('viewport'===r)p=b(s);else{var a;'scrollParent'===r?(a=n(o(e)),'BODY'===a.nodeName&&(a=window.document.documentElement)):'window'===r?a=window.document.documentElement:a=r;var f=u(a,s);if('HTML'===a.nodeName&&!y(s)){var l=h(),m=l.height,c=l.width;p.top+=f.top-f.marginTop,p.bottom=m+f.top,p.left+=f.left-f.marginLeft,p.right=c+f.left}else p=f}return p.left+=i,p.top+=i,p.right-=i,p.bottom-=i,p}function v(e){var t=e.width,o=e.height;return t*o}function E(e,t,o,i,n){var r=5<arguments.length&&void 0!==arguments[5]?arguments[5]:0;if(-1===e.indexOf('auto'))return e;var p=w(o,i,r,n),s={top:{width:p.width,height:t.top-p.top},right:{width:p.right-t.right,height:p.height},bottom:{width:p.width,height:p.bottom-t.bottom},left:{width:t.left-p.left,height:p.height}},d=Object.keys(s).map(function(e){return se({key:e},s[e],{area:v(s[e])})}).sort(function(e,t){return t.area-e.area}),a=d.filter(function(e){var t=e.width,i=e.height;return t>=o.clientWidth&&i>=o.clientHeight}),f=0<a.length?a[0].key:d[0].key,l=e.split('-')[1];return f+(l?'-'+l:'')}function x(e,t,o){var i=d(t,o);return u(o,i)}function O(e){var t=window.getComputedStyle(e),o=parseFloat(t.marginTop)+parseFloat(t.marginBottom),i=parseFloat(t.marginLeft)+parseFloat(t.marginRight),n={width:e.offsetWidth+i,height:e.offsetHeight+o};return n}function L(e){var t={left:'right',right:'left',bottom:'top',top:'bottom'};return e.replace(/left|right|bottom|top/g,function(e){return t[e]})}function S(e,t,o){o=o.split('-')[0];var i=O(e),n={width:i.width,height:i.height},r=-1!==['right','left'].indexOf(o),p=r?'top':'left',s=r?'left':'top',d=r?'height':'width',a=r?'width':'height';return n[p]=t[p]+t[d]/2-i[d]/2,n[s]=o===s?t[s]-i[a]:t[L(s)],n}function T(e,t){return Array.prototype.find?e.find(t):e.filter(t)[0]}function C(e,t,o){if(Array.prototype.findIndex)return e.findIndex(function(e){return e[t]===o});var i=T(e,function(e){return e[t]===o});return e.indexOf(i)}function N(t,o,i){var n=void 0===i?t:t.slice(0,C(t,'name',i));return n.forEach(function(t){t.function&&console.warn('`modifier.function` is deprecated, use `modifier.fn`!');var i=t.function||t.fn;t.enabled&&e(i)&&(o.offsets.popper=c(o.offsets.popper),o.offsets.reference=c(o.offsets.reference),o=i(o,t))}),o}function k(){if(!this.state.isDestroyed){var e={instance:this,styles:{},attributes:{},flipped:!1,offsets:{}};e.offsets.reference=x(this.state,this.popper,this.reference),e.placement=E(this.options.placement,e.offsets.reference,this.popper,this.reference,this.options.modifiers.flip.boundariesElement,this.options.modifiers.flip.padding),e.originalPlacement=e.placement,e.offsets.popper=S(this.popper,e.offsets.reference,e.placement),e.offsets.popper.position='absolute',e=N(this.modifiers,e),this.state.isCreated?this.options.onUpdate(e):(this.state.isCreated=!0,this.options.onCreate(e))}}function W(e,t){return e.some(function(e){var o=e.name,i=e.enabled;return i&&o===t})}function B(e){for(var t=[!1,'ms','Webkit','Moz','O'],o=e.charAt(0).toUpperCase()+e.slice(1),n=0;n<t.length-1;n++){var i=t[n],r=i?''+i+o:e;if('undefined'!=typeof window.document.body.style[r])return r}return null}function D(){return this.state.isDestroyed=!0,W(this.modifiers,'applyStyle')&&(this.popper.removeAttribute('x-placement'),this.popper.style.left='',this.popper.style.position='',this.popper.style.top='',this.popper.style[B('transform')]=''),this.disableEventListeners(),this.options.removeOnDestroy&&this.popper.parentNode.removeChild(this.popper),this}function H(e,t,o,i){var r='BODY'===e.nodeName,p=r?window:e;p.addEventListener(t,o,{passive:!0}),r||H(n(p.parentNode),t,o,i),i.push(p)}function P(e,t,o,i){o.updateBound=i,window.addEventListener('resize',o.updateBound,{passive:!0});var r=n(e);return H(r,'scroll',o.updateBound,o.scrollParents),o.scrollElement=r,o.eventsEnabled=!0,o}function A(){this.state.eventsEnabled||(this.state=P(this.reference,this.options,this.state,this.scheduleUpdate))}function M(e,t){return window.removeEventListener('resize',t.updateBound),t.scrollParents.forEach(function(e){e.removeEventListener('scroll',t.updateBound)}),t.updateBound=null,t.scrollParents=[],t.scrollElement=null,t.eventsEnabled=!1,t}function I(){this.state.eventsEnabled&&(window.cancelAnimationFrame(this.scheduleUpdate),this.state=M(this.reference,this.state))}function R(e){return''!==e&&!isNaN(parseFloat(e))&&isFinite(e)}function U(e,t){Object.keys(t).forEach(function(o){var i='';-1!==['width','height','top','right','bottom','left'].indexOf(o)&&R(t[o])&&(i='px'),e.style[o]=t[o]+i})}function Y(e,t){Object.keys(t).forEach(function(o){var i=t[o];!1===i?e.removeAttribute(o):e.setAttribute(o,t[o])})}function F(e,t,o){var i=T(e,function(e){var o=e.name;return o===t}),n=!!i&&e.some(function(e){return e.name===o&&e.enabled&&e.order<i.order});if(!n){var r='`'+t+'`';console.warn('`'+o+'`'+' modifier is required by '+r+' modifier in order to work, be sure to include it before '+r+'!')}return n}function j(e){return'end'===e?'start':'start'===e?'end':e}function K(e){var t=1<arguments.length&&void 0!==arguments[1]&&arguments[1],o=ae.indexOf(e),i=ae.slice(o+1).concat(ae.slice(0,o));return t?i.reverse():i}function q(e,t,o,i){var n=e.match(/((?:\-|\+)?\d*\.?\d*)(.*)/),r=+n[1],p=n[2];if(!r)return e;if(0===p.indexOf('%')){var s;switch(p){case'%p':s=o;break;case'%':case'%r':default:s=i;}var d=c(s);return d[t]/100*r}if('vh'===p||'vw'===p){var a;return a='vh'===p?_(document.documentElement.clientHeight,window.innerHeight||0):_(document.documentElement.clientWidth,window.innerWidth||0),a/100*r}return r}function G(e,t,o,i){var n=[0,0],r=-1!==['right','left'].indexOf(i),p=e.split(/(\+|\-)/).map(function(e){return e.trim()}),s=p.indexOf(T(p,function(e){return-1!==e.search(/,|\s/)}));p[s]&&-1===p[s].indexOf(',')&&console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.');var d=/\s*,\s*|\s+/,a=-1===s?[p]:[p.slice(0,s).concat([p[s].split(d)[0]]),[p[s].split(d)[1]].concat(p.slice(s+1))];return a=a.map(function(e,i){var n=(1===i?!r:r)?'height':'width',p=!1;return e.reduce(function(e,t){return''===e[e.length-1]&&-1!==['+','-'].indexOf(t)?(e[e.length-1]=t,p=!0,e):p?(e[e.length-1]+=t,p=!1,e):e.concat(t)},[]).map(function(e){return q(e,n,t,o)})}),a.forEach(function(e,t){e.forEach(function(o,i){R(o)&&(n[t]+=o*('-'===e[i-1]?-1:1))})}),n}for(var z=Math.min,V=Math.floor,_=Math.max,X=['native code','[object MutationObserverConstructor]'],Q=function(e){return X.some(function(t){return-1<(e||'').toString().indexOf(t)})},J='undefined'!=typeof window,Z=['Edge','Trident','Firefox'],$=0,ee=0;ee<Z.length;ee+=1)if(J&&0<=navigator.userAgent.indexOf(Z[ee])){$=1;break}var i,te=J&&Q(window.MutationObserver),oe=te?function(e){var t=!1,o=0,i=document.createElement('span'),n=new MutationObserver(function(){e(),t=!1});return n.observe(i,{attributes:!0}),function(){t||(t=!0,i.setAttribute('x-index',o),++o)}}:function(e){var t=!1;return function(){t||(t=!0,setTimeout(function(){t=!1,e()},$))}},ie=function(){return void 0==i&&(i=-1!==navigator.appVersion.indexOf('MSIE 10')),i},ne=function(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')},re=function(){function e(e,t){for(var o,n=0;n<t.length;n++)o=t[n],o.enumerable=o.enumerable||!1,o.configurable=!0,'value'in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}return function(t,o,i){return o&&e(t.prototype,o),i&&e(t,i),t}}(),pe=function(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e},se=Object.assign||function(e){for(var t,o=1;o<arguments.length;o++)for(var i in t=arguments[o],t)Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e},de=['auto-start','auto','auto-end','top-start','top','top-end','right-start','right','right-end','bottom-end','bottom','bottom-start','left-end','left','left-start'],ae=de.slice(3),fe={FLIP:'flip',CLOCKWISE:'clockwise',COUNTERCLOCKWISE:'counterclockwise'},le=function(){function t(o,i){var n=this,r=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{};ne(this,t),this.scheduleUpdate=function(){return requestAnimationFrame(n.update)},this.update=oe(this.update.bind(this)),this.options=se({},t.Defaults,r),this.state={isDestroyed:!1,isCreated:!1,scrollParents:[]},this.reference=o.jquery?o[0]:o,this.popper=i.jquery?i[0]:i,this.options.modifiers={},Object.keys(se({},t.Defaults.modifiers,r.modifiers)).forEach(function(e){n.options.modifiers[e]=se({},t.Defaults.modifiers[e]||{},r.modifiers?r.modifiers[e]:{})}),this.modifiers=Object.keys(this.options.modifiers).map(function(e){return se({name:e},n.options.modifiers[e])}).sort(function(e,t){return e.order-t.order}),this.modifiers.forEach(function(t){t.enabled&&e(t.onLoad)&&t.onLoad(n.reference,n.popper,n.options,t,n.state)}),this.update();var p=this.options.eventsEnabled;p&&this.enableEventListeners(),this.state.eventsEnabled=p}return re(t,[{key:'update',value:function(){return k.call(this)}},{key:'destroy',value:function(){return D.call(this)}},{key:'enableEventListeners',value:function(){return A.call(this)}},{key:'disableEventListeners',value:function(){return I.call(this)}}]),t}();return le.Utils=('undefined'==typeof window?global:window).PopperUtils,le.placements=de,le.Defaults={placement:'bottom',eventsEnabled:!0,removeOnDestroy:!1,onCreate:function(){},onUpdate:function(){},modifiers:{shift:{order:100,enabled:!0,fn:function(e){var t=e.placement,o=t.split('-')[0],i=t.split('-')[1];if(i){var n=e.offsets,r=n.reference,p=n.popper,s=-1!==['bottom','top'].indexOf(o),d=s?'left':'top',a=s?'width':'height',f={start:pe({},d,r[d]),end:pe({},d,r[d]+r[a]-p[a])};e.offsets.popper=se({},p,f[i])}return e}},offset:{order:200,enabled:!0,fn:function(e,t){var o,i=t.offset,n=e.placement,r=e.offsets,p=r.popper,s=r.reference,d=n.split('-')[0];return o=R(+i)?[+i,0]:G(i,p,s,d),'left'===d?(p.top+=o[0],p.left-=o[1]):'right'===d?(p.top+=o[0],p.left+=o[1]):'top'===d?(p.left+=o[0],p.top-=o[1]):'bottom'===d&&(p.left+=o[0],p.top+=o[1]),e.popper=p,e},offset:0},preventOverflow:{order:300,enabled:!0,fn:function(e,t){var o=t.boundariesElement||r(e.instance.popper);e.instance.reference===o&&(o=r(o));var i=w(e.instance.popper,e.instance.reference,t.padding,o);t.boundaries=i;var n=t.priority,p=e.offsets.popper,s={primary:function(e){var o=p[e];return p[e]<i[e]&&!t.escapeWithReference&&(o=_(p[e],i[e])),pe({},e,o)},secondary:function(e){var o='right'===e?'left':'top',n=p[o];return p[e]>i[e]&&!t.escapeWithReference&&(n=z(p[o],i[e]-('right'===e?p.width:p.height))),pe({},o,n)}};return n.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';p=se({},p,s[t](e))}),e.offsets.popper=p,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,o=t.popper,i=t.reference,n=e.placement.split('-')[0],r=V,p=-1!==['top','bottom'].indexOf(n),s=p?'right':'bottom',d=p?'left':'top',a=p?'width':'height';return o[s]<r(i[d])&&(e.offsets.popper[d]=r(i[d])-o[a]),o[d]>r(i[s])&&(e.offsets.popper[d]=r(i[s])),e}},arrow:{order:500,enabled:!0,fn:function(e,t){if(!F(e.instance.modifiers,'arrow','keepTogether'))return e;var o=t.element;if('string'==typeof o){if(o=e.instance.popper.querySelector(o),!o)return e;}else if(!e.instance.popper.contains(o))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var i=e.placement.split('-')[0],n=e.offsets,r=n.popper,p=n.reference,s=-1!==['left','right'].indexOf(i),d=s?'height':'width',a=s?'top':'left',f=s?'left':'top',l=s?'bottom':'right',m=O(o)[d];p[l]-m<r[a]&&(e.offsets.popper[a]-=r[a]-(p[l]-m)),p[a]+m>r[l]&&(e.offsets.popper[a]+=p[a]+m-r[l]);var h=p[a]+p[d]/2-m/2,g=h-c(e.offsets.popper)[a];return g=_(z(r[d]-m,g),0),e.arrowElement=o,e.offsets.arrow={},e.offsets.arrow[a]=Math.round(g),e.offsets.arrow[f]='',e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(W(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var o=w(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement),i=e.placement.split('-')[0],n=L(i),r=e.placement.split('-')[1]||'',p=[];switch(t.behavior){case fe.FLIP:p=[i,n];break;case fe.CLOCKWISE:p=K(i);break;case fe.COUNTERCLOCKWISE:p=K(i,!0);break;default:p=t.behavior;}return p.forEach(function(s,d){if(i!==s||p.length===d+1)return e;i=e.placement.split('-')[0],n=L(i);var a=e.offsets.popper,f=e.offsets.reference,l=V,m='left'===i&&l(a.right)>l(f.left)||'right'===i&&l(a.left)<l(f.right)||'top'===i&&l(a.bottom)>l(f.top)||'bottom'===i&&l(a.top)<l(f.bottom),h=l(a.left)<l(o.left),c=l(a.right)>l(o.right),g=l(a.top)<l(o.top),u=l(a.bottom)>l(o.bottom),b='left'===i&&h||'right'===i&&c||'top'===i&&g||'bottom'===i&&u,y=-1!==['top','bottom'].indexOf(i),w=!!t.flipVariations&&(y&&'start'===r&&h||y&&'end'===r&&c||!y&&'start'===r&&g||!y&&'end'===r&&u);(m||b||w)&&(e.flipped=!0,(m||b)&&(i=p[d+1]),w&&(r=j(r)),e.placement=i+(r?'-'+r:''),e.offsets.popper=se({},e.offsets.popper,S(e.instance.popper,e.offsets.reference,e.placement)),e=N(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport'},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,o=t.split('-')[0],i=e.offsets,n=i.popper,r=i.reference,p=-1!==['left','right'].indexOf(o),s=-1===['top','left'].indexOf(o);return n[p?'left':'top']=r[t]-(s?n[p?'width':'height']:0),e.placement=L(t),e.offsets.popper=c(n),e}},hide:{order:800,enabled:!0,fn:function(e){if(!F(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,o=T(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottom<o.top||t.left>o.right||t.top>o.bottom||t.right<o.left){if(!0===e.hide)return e;e.hide=!0,e.attributes['x-out-of-boundaries']=''}else{if(!1===e.hide)return e;e.hide=!1,e.attributes['x-out-of-boundaries']=!1}return e}},computeStyle:{order:850,enabled:!0,fn:function(e,t){var o=t.x,i=t.y,n=e.offsets.popper,p=T(e.instance.modifiers,function(e){return'applyStyle'===e.name}).gpuAcceleration;void 0!==p&&console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!');var s,d,a=void 0===p?t.gpuAcceleration:p,f=r(e.instance.popper),l=g(f),m={position:n.position},h={left:V(n.left),top:V(n.top),bottom:V(n.bottom),right:V(n.right)},c='bottom'===o?'top':'bottom',u='right'===i?'left':'right',b=B('transform');if(d='bottom'==c?-l.height+h.bottom:h.top,s='right'==u?-l.width+h.right:h.left,a&&b)m[b]='translate3d('+s+'px, '+d+'px, 0)',m[c]=0,m[u]=0,m.willChange='transform';else{var y='bottom'==c?-1:1,w='right'==u?-1:1;m[c]=d*y,m[u]=s*w,m.willChange=c+', '+u}var v={"x-placement":e.placement};return e.attributes=se({},v,e.attributes),e.styles=se({},m,e.styles),e},gpuAcceleration:!0,x:'bottom',y:'right'},applyStyle:{order:900,enabled:!0,fn:function(e){return U(e.instance.popper,e.styles),Y(e.instance.popper,e.attributes),e.offsets.arrow&&U(e.arrowElement,e.offsets.arrow),e},onLoad:function(e,t,o,i,n){var r=x(n,t,e),p=E(o.placement,r,t,e,o.modifiers.flip.boundariesElement,o.modifiers.flip.padding);return t.setAttribute('x-placement',p),U(t,{position:'absolute'}),o},gpuAcceleration:void 0}}},le});
+//# sourceMappingURL=popper.min.js.map
diff --git a/app/assets/stylesheets/sx-sidebar.css b/app/assets/stylesheets/sx-sidebar.css
new file mode 100644
index 00000000..933b5e32
--- /dev/null
+++ b/app/assets/stylesheets/sx-sidebar.css
@@ -0,0 +1,172 @@
+/*!
+ * Start Bootstrap - Simple Sidebar (http://startbootstrap.com/template-overviews/simple-sidebar)
+ * Copyright 2013-2017 Start Bootstrap
+ * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/blob/master/LICENSE)
+ */
+
+#wrapper {
+    padding-left: 0;
+    -webkit-transition: all 0.5s ease;
+    -moz-transition: all 0.5s ease;
+    -o-transition: all 0.5s ease;
+    transition: all 0.5s ease;
+}
+
+#wrapper.toggled {
+    padding-left: 200px;
+}
+
+#sidebar-wrapper {
+   /* z-index: 1000;*/
+    /*position: fixed;*/
+     z-index: 1;
+    position: absolute;
+    left: 200px;
+    width: 0;
+    height: 100%;
+    margin-left: -200px;
+    margin-top:-20px;
+    overflow-x: auto;
+    background: #222d32;
+    -webkit-transition: all 0.5s ease;
+    -moz-transition: all 0.5s ease;
+    -o-transition: all 0.5s ease;
+    transition: all 0.5s ease;
+}
+
+#wrapper.toggled #sidebar-wrapper {
+    width: 216px;
+}
+
+#page-content-wrapper {
+    width: 100%;
+    position: absolute;
+    padding: 0px;
+    
+}
+
+#wrapper.toggled #page-content-wrapper {
+    position: absolute;
+    margin-right: -200px;
+}
+
+
+/* Sidebar Styles */
+
+.sidebar-nav {
+    position: absolute;
+    top: 0;
+    width: 200px;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.sidebar-nav li {
+    text-indent: 20px;
+    line-height: 40px;
+}
+.sidebar-nav>li.header {
+    color: #4b646f;
+    background-color: #1a2226;
+    line-height: 35px !important;
+}
+.main-nav {
+   
+   /* background-color: #161926 !important;*/
+}
+/*.main-nav a {
+    color: #fff !important;
+}
+*/
+.sidebar-nav li a {
+    display: block;
+    text-decoration: none;
+    color: #999999;
+}
+
+.sidebar-nav li a:hover {
+    text-decoration: none;
+    color: #fff;
+    background: rgba(255, 255, 255, 0.2);
+}
+
+.sidebar-nav li a:active,
+.sidebar-nav li a:focus {
+    text-decoration: none;
+}
+
+.sidebar-nav > .sidebar-brand {
+    height: 65px;
+    font-size: 18px;
+    line-height: 60px;
+}
+
+.sidebar-nav > .sidebar-brand a {
+    color: #999999;
+}
+
+.sidebar-nav > .sidebar-brand a:hover {
+    color: #fff;
+    background: none;
+}
+
+@media(min-width:768px) {
+    #wrapper {
+        padding-left: 0;
+    }
+    #wrapper.toggled {
+        padding-left: 210px;
+    }
+    #sidebar-wrapper {
+        width: 0;
+    }
+    #wrapper.toggled #sidebar-wrapper {
+        width: 216px;
+    }
+    #page-content-wrapper {
+        padding: 0px;
+        position: relative;
+    }
+    #wrapper.toggled #page-content-wrapper {
+        position: relative;
+        margin-right: 0;
+    }
+}
+
+.dropdown-item{
+    padding: 0px 1.5rem !important;
+}
+
+.sidebar-sub-menu {
+    position: relative !important;
+    width: 200px;
+    list-style: none;
+    font-size: 14px;
+    background-color: #161926;
+    padding: 0px !important;
+    margin: 0px !important;
+}
+
+.sidebar-sub-item {
+    display: block;
+    width: 100%;
+    
+    /*clear: both;*/
+    /*font-weight: normal;*/
+    /*color: #292b2c;
+    text-align: inherit;
+    white-space: nowrap;
+    background: none;
+    border: 0;*/
+}
+.fa{
+   
+}
+.custom-fa-arrow{
+     font-size: 20px !important;
+    font-weight: bold;
+    padding: 9px 20px;
+}
+
+
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 0883cc92..7863008d 100644
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -1,195 +1,192 @@
-<div class="row">
-  <div class="col-md-9 col-lg-9">
-      <h4><strong>Role Features</strong></h4>
-      <!--  <p><strong>Note:</strong> The <strong>data-parent</strong> attribute makes sure that all collapsible elements under the specified parent will be closed when one of the collapsible item is shown.</p> -->
-      <div class="panel-group" id="accordion">
-        <% if current_user.role == 'administrator' %>
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h4 class="panel-title">
-                  Administrator
-                </h4>
-              </div>
-              <div id="admin" class="panel-collapse collapse in">
-                <div class="panel-body">
-                  <ul class="col-md-4">
-                    <li><strong>All Settings</strong></li>
-                    <ul>
-                      <li>Zone</li>
-                      <li>OQS</li>
-                      <li>Menu</li>
-                      <li>Cashier Terminal</li>
-                      <li>Payment</li>
-                      <li>Merbership</li>
-                      <li>Print</li>
-                      <li>Employees</li>
-                      <li>Accounts</li>
-                    </ul>
-                  </ul>
-                  <ul class="col-md-4">
-                    <li><strong>Transactions</strong></li>
-                    <ul class="">
-                      <li>Order</li>
-                      <li>Sale</li>
-                      <li>Credit Note</li>
-                    </ul><br>
-                    <li><strong>Reports</strong></li>
-                    <ul class="">
-                      <li>Daily Sale</li>
-                      <li>Sale Item</li>
-                      <li>Receipt</li>
-                      <li>Shift Sale</li>
-                      <li>Credit Sale</li>
-                      <li>Void Sale</li>
-                    </ul>
-                  </ul>
-                  <ul class="col-md-4">
-                    <li><strong>OQS</strong></li><br>
-                    <li><strong>Cashier</strong></li><br>
-                    <li><strong>CRM</strong></li>
-                  </ul>
-                </div>
-              </div>
+ 
+<!-- Page Content -->
+    <div class="row">
+      <div class="col-md-9 col-lg-9">
+        <h4><strong>Role Features</strong></h4>
+        <!--  <p><strong>Note:</strong> The <strong>data-parent</strong> attribute makes sure that all collapsible elements under the specified parent will be closed when one of the collapsible item is shown.</p> -->
+        <div class="panel-group" id="accordion">
+          <% if current_user.role == 'administrator' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                Administrator
+              </h4>
             </div>
-        <% elsif current_user.role == 'manager' %>
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h4 class="panel-title">
-                  Manager
-                </h4>
-              </div>
-              <div id="admin" class="panel-collapse collapse in">
-                <div class="panel-body">
-                  <ul class="col-md-4">
-                    <li class="">All Settings</li>
-                    <ul class="">
-                      <li>Zone</li>
-                      <li>OQS</li>
-                      <li>Menu</li>
-                      <li>Cashier Terminal</li>
-                      <li>Print</li>
-                      <li>Employees</li>
-                      <li>Accounts</li>
-                    </ul>
-                  </ul>
-                  <ul class="col-md-4">
-                    <li class="">Transactions</li>
-                    <ul class="">
-                      <li>Order</li>
-                      <li>Sale</li>
-                      <li>Credit Note</li>
-                    </ul><br>
-                    <li>Reports</li>
-                    <ul class="">
-                      <li>Daily Sale</li>
-                      <li>Sale Item</li>
-                      <li>Receipt</li>
-                      <li>Shift Sale</li>
-                      <li>Credit Sale</li>
-                      <li>Void Sale</li>
-                    </ul>
-                  </ul>
-                  <ul class="col-md-4">
-                    <li>OQS</li><br>
-                    <li>Cashier</li><br>
-                    <li>CRM</li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-        <% elsif current_user.role == 'supervisour' %>
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h4 class="panel-title">
-                  Supervisor
-                </h4>
-              </div>
-              <div id="supervisor" class="panel-collapse collapse in">
-                <div class="panel-body">
-                  <ul class="">
+            <div id="admin" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="col-md-4">
+                  <li><strong>All Settings</strong></li>
+                  <ul>
+                    <li>Zone</li>
                     <li>OQS</li>
-                    <ul>
-                      <li class="">Void</li>
-                      <li class="">FOC</li>
-                      <li class="">Edit</li>
-                      <li class="">Credit</li>
-                      <li class="">Payment</li>
-                    </ul>
+                    <li>Menu</li>
+                    <li>Cashier Terminal</li>
+                    <li>Payment</li>
+                    <li>Merbership</li>
+                    <li>Print</li>
+                    <li>Employees</li>
+                    <li>Accounts</li>
                   </ul>
-                </div>
-              </div>
-            </div>
-        <% elsif current_user.role == 'cashier' %>
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h4 class="panel-title">
-                  Cashier
-                </h4>
-              </div>
-              <div id="cashier" class="panel-collapse collapse in">
-                <div class="panel-body">
+                </ul>
+                <ul class="col-md-4">
+                  <li><strong>Transactions</strong></li>
                   <ul class="">
-                    <li class="">Cashier Panel except Edit and Void</li>
-                    <li class="">Sale and Order</li>
-                    <li class="">and Queue in CRM</li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-        <% elsif current_user.role == 'account' %>
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h4 class="panel-title">
-                  Accountant
-                </h4>
-              </div>
-              <div id="accountant" class="panel-collapse collapse in">
-                <div class="panel-body">
+                    <li>Order</li>
+                    <li>Sale</li>
+                    <li>Credit Note</li>
+                  </ul><br>
+                  <li><strong>Reports</strong></li>
                   <ul class="">
-                    <li class="">Daily Sale Report</li>
-                    <li class="">Sale Item Report</li>
-                    <li class="">Receipt No Report</li>
-                    <li class="">ShiftSale Report</li>
+                    <li>Daily Sale</li>
+                    <li>Sale Item</li>
+                    <li>Receipt</li>
+                    <li>Shift Sale</li>
+                    <li>Credit Sale</li>
+                    <li>Void Sale</li>
                   </ul>
-                </div>
+                </ul>
+                <ul class="col-md-4">
+                  <li><strong>OQS</strong></li><br>
+                  <li><strong>Cashier</strong></li><br>
+                  <li><strong>CRM</strong></li>
+                </ul>
               </div>
             </div>
-        <% end %>
-    </div>
-  </div>
-
-  <div class="col-md-3">
-    <div class="card" id="oqs" onclick="location.href='<%= oqs_root_path %>'">
-      <div class="card-content dashboard-nav">OQS</div>
-    </div>
-    
-    <div class="card" id="origami" onclick="location.href='<%= origami_root_path %>'">
-      <div class="card-content dashboard-nav">Cashier</div>
-    </div>
-    
-    <div class="card" id="crm" onclick="location.href='<%= crm_root_path %>'">
-      <div class="card-content dashboard-nav">CRM</div>
-    </div>
-    
-    <!-- No Needs
-    <div class="card" id="backend" onclick="location.href='<%= dashboard_path %>'">
-      <div class="card-content">
-        <span class="card-title">Backend</span>
+          </div>
+          <% elsif current_user.role == 'manager' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                Manager
+              </h4>
+            </div>
+            <div id="admin" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="col-md-4">
+                  <li class="">All Settings</li>
+                  <ul class="">
+                    <li>Zone</li>
+                    <li>OQS</li>
+                    <li>Menu</li>
+                    <li>Cashier Terminal</li>
+                    <li>Print</li>
+                    <li>Employees</li>
+                    <li>Accounts</li>
+                  </ul>
+                </ul>
+                <ul class="col-md-4">
+                  <li class="">Transactions</li>
+                  <ul class="">
+                    <li>Order</li>
+                    <li>Sale</li>
+                    <li>Credit Note</li>
+                  </ul><br>
+                  <li>Reports</li>
+                  <ul class="">
+                    <li>Daily Sale</li>
+                    <li>Sale Item</li>
+                    <li>Receipt</li>
+                    <li>Shift Sale</li>
+                    <li>Credit Sale</li>
+                    <li>Void Sale</li>
+                  </ul>
+                </ul>
+                <ul class="col-md-4">
+                  <li>OQS</li><br>
+                  <li>Cashier</li><br>
+                  <li>CRM</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+          <% elsif current_user.role == 'supervisour' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                Supervisor
+              </h4>
+            </div>
+            <div id="supervisor" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="">
+                  <li>OQS</li>
+                  <ul>
+                    <li class="">Void</li>
+                    <li class="">FOC</li>
+                    <li class="">Edit</li>
+                    <li class="">Credit</li>
+                    <li class="">Payment</li>
+                  </ul>
+                </ul>
+              </div>
+            </div>
+          </div>
+          <% elsif current_user.role == 'cashier' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                Cashier
+              </h4>
+            </div>
+            <div id="cashier" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="">
+                  <li class="">Cashier Panel except Edit and Void</li>
+                  <li class="">Sale and Order</li>
+                  <li class="">and Queue in CRM</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+          <% elsif current_user.role == 'account' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                Accountant
+              </h4>
+            </div>
+            <div id="accountant" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="">
+                  <li class="">Daily Sale Report</li>
+                  <li class="">Sale Item Report</li>
+                  <li class="">Receipt No Report</li>
+                  <li class="">ShiftSale Report</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+          <% end %>
+        </div>
       </div>
-    </div> -->
-    
-    <div class="card" id="backend" onclick="location.href='<%= inventory_path %>'">
-      <div class="card-content dashboard-nav">Inventory</div>
-    </div>
-  </div>
-</div>
 
-<div class="footer" style="background-color: inherit">
-  <div class="card">
-    <div class="page-header center-text">
-     <h4 class="footer-header">
-      <%= @shop.name %>
-     </h4>
+      <div class="col-md-3">
+        <div class="card" id="oqs" onclick="location.href='<%= oqs_root_path %>'">
+          <div class="card-content dashboard-nav">OQS</div>
+        </div>
+
+        <div class="card" id="origami" onclick="location.href='<%= origami_root_path %>'">
+          <div class="card-content dashboard-nav">Cashier</div>
+        </div>
+
+        <div class="card" id="crm" onclick="location.href='<%= crm_root_path %>'">
+          <div class="card-content dashboard-nav">CRM</div>
+        </div>
+
+        <div class="card" id="backend" onclick="location.href='<%= inventory_path %>'">
+          <div class="card-content dashboard-nav">Inventory</div>
+        </div>
+      </div>
+
+
+    </div>
+
+  <div class="" style="background-color: inherit;">
+    <div class="">
+      <div class="page-header center-text">
+       <h4 class="footer-header">
+        <%= @shop.name %>
+      </h4>
     </div>
     <div class="center-text">
       <%= @shop.address %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 328437ca..ea3ffc5e 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,10 +1,14 @@
+
 <nav class="navbar navbar-toggleable-md fixed-top navbar-light setting_nav">
-   <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-     <span class="navbar-toggler-icon"></span>
-   </button>
-   <a class="navbar-brand" href="<%= root_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
+  
+  <a href="#" class=" btn btn-info btn-sm " id="sx-menu-toggle" data-toggle="push-menu" role="button">
+      <span class="fa fa-bars" ></span>
+  </a>  
+  
+   <a class="navbar-brand" href="<%= dashboard_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
+
    <div class="collapse navbar-collapse" id="navbarCollapse">
-     <ul class="navbar-nav mr-auto">
+      <!-- <ul class="navbar-nav mr-auto">
         <li class="navbar-nav mr-auto dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Settings</a>
           <ul class="dropdown-menu">
@@ -70,8 +74,8 @@
         </li>
 
 
-     </ul>
-
+     </ul>  -->
+       
    </div>
    <% if current_login_employee %>
      <div class="right">
@@ -94,3 +98,10 @@
           margin-bottom: 10px !important;
         }
 </style>
+<!-- Menu Toggle Script -->
+<script>
+  $("#sx-menu-toggle").click(function(e) {
+    e.preventDefault();
+    $("#wrapper").toggleClass("toggled");
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
new file mode 100644
index 00000000..a34061b4
--- /dev/null
+++ b/app/views/layouts/_sidebar.html.erb
@@ -0,0 +1,85 @@
+<div id="sidebar-wrapper">
+  <ul class="sidebar-nav">
+    <li class="header"><a>Main Navigation</a></li>
+    <li>
+       <%= link_to "Dashboard ", dashboard_path,:class =>"" %>
+     </li>
+    <li>
+       <%= link_to "OQS ", oqs_root_path,:class =>"" %>
+    </li>
+    <li>
+      <%= link_to "Cashier ", origami_root_path,:class =>"" %>
+    </li>
+    <li>
+      <%= link_to "CRM ", crm_customers_path,:class =>"" %>
+    </li>
+    <li>
+      <%= link_to "Inventory ", transactions_sales_path,:class =>"" %>
+    </li>
+
+    <li class="header"><a>Settings</a></li>
+
+    <li>
+      <%= link_to "Zones ", transactions_sales_path,:class =>"" %>
+    </li>
+    <li>
+      <%= link_to "Order Queue Station ", transactions_sales_path,:class =>"" %>
+    </li>
+    <li>
+      <%= link_to "Menu ", settings_menus_path,:class =>"" %>
+    </li>
+
+    <li>
+      <%= link_to "Cashier Terminal ", transactions_sales_path,:class =>"" %>
+    </li>
+
+    <li>
+      <%= link_to "Print Settings ", transactions_sales_path,:class =>"" %>
+    </li>
+    <li>
+      <%= link_to "Staff ", settings_menus_path,:class =>"" %>
+    </li>
+
+    <li>
+      <%= link_to "Product ", transactions_sales_path,:class =>"" %>
+    </li>
+
+    <li>
+      <%= link_to "Promotion ", transactions_sales_path,:class =>"" %>
+    </li>
+    <li>
+      <div class="dropdown">
+        <a class="custom-dropdown" href="#" id="dropdownMenuButton"  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Transaction <i class="fa fa-angle-left pull-right custom-fa-arrow"></i>
+        </a> 
+        <div class="dropdown-menu sidebar-sub-menu" aria-labelledby="dropdownMenuButton">
+         <%= link_to "Orders ", transactions_orders_path,:class =>"dropdown-item sidebar-sub-item" %>
+         <%= link_to "Sales ", transactions_sales_path,:class =>"dropdown-item sidebar-sub-item" %>
+         <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"dropdown-item  sidebar-sub-item" %>
+       </div>
+     </div>
+    </li>
+    <!-- <li>
+              <div class="dropdown">
+                <a class="custom-dropdown" href="#" id="dropdownMenuButton"  data-toggle="dropdown" aria-haspopup="true" ariaroot_path-expanded="false">
+                Transaction <i class="fa fa-angle-left pull-right custom-fa-arrow"></i>
+              </a> 
+              <div class="dropdown-menu sidebar-sub-menu" aria-labelledby="dropdownMenuButton">
+                 <%= link_to "Daily Sale Report", reports_dailysale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+                <%= link_to "Sales Item Report", reports_saleitem_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+                <%= link_to "Receipt Report", reports_receipt_no_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+                <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+                <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+                <%= link_to "Void Sale Report", reports_void_sale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+                <%= link_to "Commission Report", reports_commission_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+                <%= link_to "Stock Check Report", reports_stock_check_index_path, :class =>"dropdown-item sidebar-sub-item" %>
+              </div>
+              </div>
+         </li> -->
+            
+      <li>
+           <%= link_to "Reports", reports_dailysale_index_path, :class =>"" %>
+      </li>
+     </ul>
+
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1edcfb2e..2cc480a2 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,9 +12,11 @@
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'sx-sidebar', media: 'all', 'data-turbolinks-track': 'reload' %>
     
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
     <%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %>      
+    <%= javascript_include_tag 'popper.min', 'data-turbolinks-track': 'reload' %> 
   </head>
 
   <body>
@@ -35,7 +37,15 @@
 						    <%= message %>
 						  </div>
 			<% end %>
-      <%= yield %>      
+      <div id="wrapper">
+        <!-- Sidebar -->
+         <%=render 'layouts/sidebar' %>
+        <!-- /#sidebar-wrapper -->
+         <div id="page-content-wrapper">
+           <%= yield %>  
+          </div>   
+      </div>
+       
     </div>
 
     <script type="text/javascript">
diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb
index b7ac154e..49eb1ea5 100644
--- a/app/views/reports/commission/_commission_report_filter.html.erb
+++ b/app/views/reports/commission/_commission_report_filter.html.erb
@@ -1,42 +1,39 @@
-<div class="row">
-  <div class="col-md-12">
-    <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
-        <% if period_type != false %>
-            <div class="row">
 
-              <div class="form-group col-md-3">
-                <label class="">Select Date Range</label>
-                <% if @daterange %>
-                    <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
-                <% else %>
-                    <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
-                <% end %>
-              </div>
-              <div class="form-group col-md-3">
-                <label class="">Commissioner</label>
-                <select class="form-control" name="commissioner" id="commissioner">
-                  <option value=""></option>
-                  <% @commissioner.each do |c| %>
-                      <% if @com_id == c.id %>
-                          <option value="<%= c.id %>" selected><%= c.name %></option>
-                      <% else %>
-                          <option value="<%= c.id %>"><%= c.name %></option>
-                      <% end %> %>
-                  <% end %>
-                </select>
-              </div>
-              <div class="form-group col-md-2 margin-top-20">
-                <input type="submit" value="Generate Report" class='btn btn-primary'>
-              </div>
-              <div class="form-group col-md-2 margin-top-20">
-                <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
-              </div>
-            </div>
+<%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
+  <% if period_type != false %>
+  <div class="row">
+
+    <div class="form-group col-md-3">
+      <label class="">Select Date Range</label>
+      <% if @daterange %>
+      <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
+      <% else %>
+      <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
+      <% end %>
+    </div>
+    <div class="form-group col-md-3">
+      <label class="">Commissioner</label>
+      <select class="form-control" name="commissioner" id="commissioner">
+        <option value=""></option>
+        <% @commissioner.each do |c| %>
+        <% if @com_id == c.id %>
+        <option value="<%= c.id %>" selected><%= c.name %></option>
+        <% else %>
+        <option value="<%= c.id %>"><%= c.name %></option>
+        <% end %> %>
         <% end %>
-
-    <% end %>
+      </select>
+    </div>
+    <div class="form-group col-md-2 margin-top-20">
+      <input type="submit" value="Generate Report" class='btn btn-primary'>
+    </div>
+    <div class="form-group col-md-2 margin-top-20">
+      <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
+    </div>
   </div>
-</div>
+  <% end %>
+
+<% end %>
 
 <script type="text/javascript">
 
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 749a62fc..f20895d8 100644
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -1,3 +1,5 @@
+<div class="row">
+  <div class="col-md-12">
 <div class="page-header">
   <ul class="breadcrumb">
     <li><a href="<%= dashboard_path %>">Home</a></li>
@@ -5,23 +7,23 @@
   </ul>
 </div>
 
-<div class="container">
+<!-- <div class="container"> -->
   <%= render :partial => 'commission_report_filter',
              :locals => {:period_type => true, :shift_name => true, :report_path => reports_commission_index_path} %>
   <hr/>
-</div>
+<!-- </div> -->
 
-<div class="container">
-  <div class="row">
-    <div class="col-md-12 text-right">
+<!-- <div class="container"> -->
+  <!-- <div class="row"> -->
+    <div class="text-right">
       <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-default">Export to
         Excel</a>
     </div>
-  </div>
-</div>
+  <!-- </div> -->
+<!-- </div> -->
 
-<div class="container margin-top-20">
-  <div class="card row">
+<div class="margin-top-20">
+  <div class="card">
     <div class="table-responsive">
       <table class="table table-striped">
         <thead>
diff --git a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
index 5313e61d..83575970 100644
--- a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
@@ -1,125 +1,121 @@
-<div class="row">
-	<div class="col-md-12">
-			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-				<% if period_type != false %>
-					<div class="row">
-						<div class="form-group col-md-2">
-							<label>Select Period</label>
-							<select name="period" id="sel_period" class="form-control">
-							    <option value="">Select Period</option>
-								<option value="0">Today</option>
-								<option value="1">Yesterday</option>
-								<option value="2">This week</option>
-								<option value="3">Last week</option>
-								<option value="4">Last 7 days</option>
-								<option value="5">This month</option>
-								<option value="6">Last month</option>
-								<option value="7">Last 30 days</option>
-								<option value="8">This year</option>
-								<option value="9">Last year</option>
-							</select>
-						</div>
-						
-						<div class="form-group col-md-2">					
-							<!-- <label class="">Select Shift Period</label> -->
-				  			<label class="">From</label>
-							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-						</div>
-						<div class="form-group col-md-2">
-							<label class="">To</label>
-							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-						</div>
-						<div class="form-group col-md-3">
-						<label class="">All Shift</label>
-							<select class="form-control select" name="shift_name" id="shift_name" >
-							</select>
-						</div>
-						<div class="form-group col-md-1 margin-top-20">
-							<input type="submit" value="Generate Report" class='btn btn-primary'>
-						</div>							
-					</div>													
-				<% end %>
-				
-			<% end %>		
-	</div>
-</div>
 
+<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+		<div class="row">
+			<div class="form-group col-md-2">
+				<label>Select Period</label>
+				<select name="period" id="sel_period" class="form-control">
+					<option value="">Select Period</option>
+					<option value="0">Today</option>
+					<option value="1">Yesterday</option>
+					<option value="2">This week</option>
+					<option value="3">Last week</option>
+					<option value="4">Last 7 days</option>
+					<option value="5">This month</option>
+					<option value="6">Last month</option>
+					<option value="7">Last 30 days</option>
+					<option value="8">This year</option>
+					<option value="9">Last year</option>
+				</select>
+			</div>
+
+			<div class="form-group col-md-2">					
+				<!-- <label class="">Select Shift Period</label> -->
+				<label class="">From</label>
+				<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+			</div>
+			<div class="form-group col-md-2">
+				<label class="">To</label>
+				<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+			</div>
+			<div class="form-group col-md-3">
+				<label class="">All Shift</label>
+				<select class="form-control select" name="shift_name" id="shift_name" >
+				</select>
+			</div>
+			<div class="form-group col-md-1 margin-top-20">
+				<input type="submit" value="Generate Report" class='btn btn-primary'>
+			</div>							
+		</div>													
+	<% end %>
+
+<% end %>		
 
 <script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
+	$(function(){
+		$('#custom_excel').hide();
+		
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
 		// window.location = url;
 	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
+		
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+		
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
 
- <% if params[:shift_name].to_i > 0%>
+	<% if params[:shift_name].to_i > 0%>
 	shift_id = '<%= params[:shift_name] %>'
 	local_date = '<%= @shift_from %> - <%= @shift_to %> '
 	var shift = $('#shift_name');
 	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
 	shift.append(str);
-<% end %>
+	<% end %>
 
- $("#from").val("<%=params[:from] rescue '-'%>");
- $("#to").val("<%=params[:to] rescue '-'%>");
-  $("#sel_period").val(<%=params[:period] rescue '-'%>);
- $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
  // shift = $(".shift-id").text()
  // if (shift.length>0) {
  //  $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
  // }
 
-<% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
-<% else %>
-	$("#rd_period_type_0").attr("checked","checked");
-<% end %>
-$(".btn-group button").removeClass("active");
-<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-$("#btn_report_type_<%= report_type %>").addClass("active");
+ <% if params[:period_type] == 1 || params[:period_type] == "1" %>
+ $("#rd_period_type_1").attr("checked","checked");
+ <% else %>
+ $("#rd_period_type_0").attr("checked","checked");
+ <% end %>
+ $(".btn-group button").removeClass("active");
+ <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+ $("#btn_report_type_<%= report_type %>").addClass("active");
 
-$('#item').change(function(){
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
+ $('#item').change(function(){
+ 	var item = $('#item').val();
+ 	var payment_type = $('#payment_type');
 
-	if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();		
-		if(payment_type){
-			$('#payment_type').show();
-		}
-	}
-	else{
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}
-	}
-});
+ 	if(item == 'sale'){
+ 		$('#waiter').hide();
+ 		$('#cashier').show();		
+ 		if(payment_type){
+ 			$('#payment_type').show();
+ 		}
+ 	}
+ 	else{
+ 		$('#cashier').hide();
+ 		$('#waiter').show();
+ 		if(payment_type){
+ 			$('#payment_type').hide();
+ 		}
+ 	}
+ });
 </script>
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 6e3e6a58..7cc0112c 100644
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -5,22 +5,22 @@
 	</ul>
 </div>
 
-<div class="container">
+<!-- <div class="container"> -->
 	<%= render :partial=>'shift_sale_report_filter',
 	:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %>
 	<hr />
-</div>
+<!-- </div> -->
 
- <div class="container">
-	<div class="row">
-		<div class="col-md-12 text-right">
+ <!-- <div class="container"> -->
+	<!-- <div class="row"> -->
+		<div class="text-right">
 			<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
 		</div>	  			
-	</div>
-</div> 
+	<!-- </div> -->
+   <!--  </div>  -->
 
-<div class="container margin-top-20">
-	<div class="card row">
+<div class="margin-top-20">
+	<div class="card ">
 		<% unless @sale_data.blank? %>
 
 			<table class="table table-striped" border="0">
diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
index d49d2660..0208090f 100644
--- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
@@ -1,144 +1,122 @@
-<div class="row">
-	<div class="col-md-12">
-			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-				<% if period_type != false %>
-					<div class="row">
-						<div class="form-group col-md-2">
-							<label>Select Period</label>
-							<select name="period" id="sel_period" class="form-control">
-							    <option value="">Select Period</option>
-								<option value="0">Today</option>
-								<option value="1">Yesterday</option>
-								<option value="2">This week</option>
-								<option value="3">Last week</option>
-								<option value="4">Last 7 days</option>
-								<option value="5">This month</option>
-								<option value="6">Last month</option>
-								<option value="7">Last 30 days</option>
-								<option value="8">This year</option>
-								<option value="9">Last year</option>
-							</select>
-						</div>
-						<input type="hidden" name="report_type" value="daily_sale" id="sel_sale_type">
-						
-						<div class="form-group col-md-3">					
-							<!-- <label class="">Select Shift Period</label> -->
-				  			<label class="">From</label>
-							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-						</div>
-						<div class="form-group col-md-3">
-							<label class="">To</label>
-							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-						</div>
-						<div class="form-group col-md-2 margin-top-20">
-							<input type="submit" value="Generate Report" class='btn btn-primary'>
-						</div>							
-					</div>													
-				<% end %>
-				
-				<!-- <div class="row">
-					<% if defined? show_monthly %>
-						<div class="span3" style="margin-bottom:10px;">
-							<input type="hidden" id="report_type" name="report_type" value="0">
-							<div class="btn-group" data-toggle="buttons-radio">
-							  <button id="btn_report_type_1" onclick="$('#report_type').val(1)" type="button" class="btn btn-inverse">Monthly</button>
-							  <button id="btn_report_type_2" onclick="$('#report_type').val(2)" type="button" class="btn btn-inverse">Yearly</button>
-							</div>
-						</div>
-					<% end %>
-				</div> -->
-	
-				<div class="row">
-					<div class="form-group">
-					<% if defined? promotions %>
-						<%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? menu_types %>
-						<%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %>	
-					<% end %>
-					
-					<% if defined? payments %>
-						<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
-					<% end %>
-					
-					<% if defined? shift_name %>
-						<!-- Temporary no needs
-						<select name="shift_name" id="shift_name"></select> 
-						-->
-					<% end %>
 
-					<% if defined? cashiers %>
-						<%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %>
-					<% end %>
-						
-					<% if defined? singer %>
-						<%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? bsm %>		
-						<%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %>
-					<% end %>		
-					
-					<% if defined? guest_role %>
-						<%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? list_by_payment_type %> <!-- for report detail by credit and foc -->
-						<%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %>	
-					<% end %>				
-					
-					<% if defined? products %>
-						<%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %>	
-					<% end %>
+<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+		<div class="row">
+			<div class="form-group col-md-2">
+				<label>Select Period</label>
+				<select name="period" id="sel_period" class="form-control">
+					<option value="">Select Period</option>
+					<option value="0">Today</option>
+					<option value="1">Yesterday</option>
+					<option value="2">This week</option>
+					<option value="3">Last week</option>
+					<option value="4">Last 7 days</option>
+					<option value="5">This month</option>
+					<option value="6">Last month</option>
+					<option value="7">Last 30 days</option>
+					<option value="8">This year</option>
+					<option value="9">Last year</option>
+				</select>
+			</div>
+			<input type="hidden" name="report_type" value="daily_sale" id="sel_sale_type">
 
-					<% if defined? items %>	
-						<%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %>			
-					<% end %>
-					</div>
-				</div>
+			<div class="form-group col-md-3">					
+				<!-- <label class="">Select Shift Period</label> -->
+				<label class="">From</label>
+				<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+			</div>
+			<div class="form-group col-md-3">
+				<label class="">To</label>
+				<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+			</div>
+			<div class="form-group col-md-2 margin-top-20">
+				<input type="submit" value="Generate Report" class='btn btn-primary'>
+			</div>							
+		</div>													
+	<% end %>
 
-				<!-- <div class="row">
-					<div class="col-md-12">
-						<input type="submit" value="Generate Report" class='btn btn-primary'>
-					</div>
-				</div> -->
-				
+	<div class="row">
+		<div class="form-group">
+			<% if defined? promotions %>
+			<%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %>
+			<% end %>
+
+			<% if defined? menu_types %>
+			<%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %>	
+			<% end %>
+
+			<% if defined? payments %>
+			<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
+			<% end %>
+
+			<% if defined? shift_name %>
+			<!-- Temporary no needs
+			<select name="shift_name" id="shift_name"></select> -->
+			<% end %>
+
+			<% if defined? cashiers %>
+			<%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %>
+			<% end %>
+
+			<% if defined? singer %>
+			<%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %>
+			<% end %>
+					
+			<% if defined? bsm %>		
+			<%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %>
 			<% end %>		
-	</div>
-</div>
+					
+			<% if defined? guest_role %>
+			<%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %>
+			<% end %>
+					
+			<% if defined? list_by_payment_type %> <!-- for report detail by credit and foc -->
+			<%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %>	
+			<% end %>				
+					
+			<% if defined? products %>
+			<%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %>	
+			<% end %>
+
+			<% if defined? items %>	
+			<%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %>			
+			<% end %>
+		</div>
+    </div>
+				
+<% end %>		
 
 <script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
-		// window.location = url;
+	$(function(){
+		$('#custom_excel').hide();
+
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
+
+		});
+
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
 	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
 
 //Reset the form to pervious values
 $("#branch").val(<%=params[:branch]%>);
@@ -156,9 +134,9 @@ $("#sel_period").val(<%=params[:period]%>);
 $("#sel_sale_type").val(<%=params[:sale_type]%>);
 
 <% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
+$("#rd_period_type_1").attr("checked","checked");
 <% else %>
-	$("#rd_period_type_0").attr("checked","checked");
+$("#rd_period_type_0").attr("checked","checked");
 <% end %>
 $(".btn-group button").removeClass("active");
 <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 1b94d2c9..25313435 100644
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -1,139 +1,152 @@
-<div class="page-header">
- <ul class="breadcrumb">
-  <li><a href="<%= dashboard_path %>">Home</a></li>
-  <li>Daily Sale Report</li>
- </ul>
-</div>
-
-<div class="container">
-    <%= render :partial=>'shift_sale_report_filter',
-    		   :locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
-	<hr />
-</div>
-
-<div class="container">
-	<div class="row">
-		<div class="col-md-12 text-right">
-			<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
-		</div>	  			
-	</div>
-</div>
-
-<div class="container margin-top-20">
-	<div class="card row">
-	  <div class="table-responsive">
-	  <table class="table table-bordered">
-	  <thead> 
-		    <tr>
-		        <th colspan="15"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-		   </tr>
-		    <tr>
-		    <th style='text-align:center;'>Sr</th>
-		    <th style='text-align:center;'>Date</th>
-		    <th style='text-align:center;'>Void Amount</th>
-		    <th style='text-align:center;'>Mpu Sales</th>
-		    <th style='text-align:center;'>Master Sales</th>
-		    <th style='text-align:center;'>Visa Sales</th>
-		    <th style='text-align:center;'>Jcb Sales</th>
-		    <th style='text-align:center;'>Redeem Sales</th>
-		    <th style='text-align:center;'>Cash Sales</th>
-		    <th style='text-align:center;'>Credit Sales</th>
-		    <th style='text-align:center;'>FOC Sales</th>
-		    <th style='text-align:center;'>(Discount)</th>
-		    <th style='text-align:center;'>Grand Total + <br/> Rounding Adj.</th>     
-		    <th style='text-align:center;'>Rounding Adj.</th>
-		    <th style='text-align:center;'>Grand Total</th>     	        
-		    </tr>
-		  </thead>
-		<% unless @sale_data.empty? %>
-		  
-		  <tbody>
-		  <% void   = 0 %>
-		  <% mpu    = 0 %>
-		  <% master = 0 %>
-		  <% visa   = 0 %>
-		  <% jcb    = 0 %>
-		  <% paypar = 0 %>
-		  <% cash   = 0 %>
-		  <% credit = 0 %>
-		  <% foc    = 0 %>
-		  <% discount = 0 %>
-		  <% total    = 0 %>
-		  <% grand_total = 0 %> 
-		  <% old_grand_total = 0 %>  
-		  <% count = 1 %> <% rounding_adj = 0 %>
-		  <% @sale_data.each do |sale| %>
-		    <% void += sale[:void_amount] %>
-		    <% mpu += sale[:mpu_amount] %>
-		    <% master += sale[:master_amount] %>
-		    <% visa += sale[:visa_amount] %>
-		    <% jcb += sale[:jcb_amount] %>
-		    <% paypar += sale[:paypar_amount] %>
-		    <% cash += sale[:cash_amount]-sale[:total_change_amount] %>
-		    <% credit += sale[:credit_amount] %>   
-		    <% foc += sale[:foc_amount] %>
-		    <% discount += sale[:total_discount] %>
-		    <% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f  %>
-		    <% grand_total += sale[:grand_total].to_f  %>	
-		    <% old_grand_total += sale[:old_grand_total].to_f  %>	
-		    <% rounding_adj += sale[:rounding_adj].to_f %>	
-		  <tr>
-		    <td style='text-align:right;'><%= count %></td>
-		    <td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
-		    <td style='color:red;text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
-		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%></td>	   	
-		  </tr>
-		  <% count = count + 1 %>
-		  <% end %>
-
-		  <tr style="font-weight:600;">
-		    <td colspan="3" style='text-align:center;'>Total</td>	
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
-		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%></td>   
-		  </tr>
-
-		  <% total_tax = 0 %>
-		  <% unless @tax.empty? %>
-		  <% @tax.each do |tax| %>
-		  <% total_tax += tax.tax_amount.to_f %>
-		  <tr style="font-weight:600;">
-		    <td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%></td>
-			<td colspan="2">&nbsp;</td>
-		  </tr>
-		  
-		  <% end %>
-		  <% net = total - total_tax %>
-		  <tr style="font-weight:600;">
-		    <td colspan="12" style='text-align:right;'>Net Amount</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
-			<td colspan="2">&nbsp;</td>	
-		  </tr>
-		  <% end %>
-		  </tbody>
-		<% end %>
-		</table>
+<div class="row">
+	<div class="col-md-12">
+		<div class="row">
+			<div class="page-header col-md-12 col-lg-12">
+				<ul class="breadcrumb">
+					<li><a href="<%= dashboard_path %>">Home</a></li>
+					<li>Daily Sale Report</li>
+				</ul>
+			</div>
 		</div>
+
+		<!-- <div class="row">
+			<div class="col-md-12 col-lg-12"> -->
+				<!-- <div class="container"> -->
+				<%= render :partial=>'shift_sale_report_filter',
+				:locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
+				<hr />
+				<!-- </div> -->
+		<!-- 	</div>
+		</div> -->
+
+		<!-- <div class="row"> -->
+			<!-- <div class="container"> -->
+			<div class=" text-right">
+				<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+			</div>	  			
+			<!-- </div> -->
+		<!-- </div> -->
+
+		<div class="row">
+			<div class="col-md-12 col-lg-12">
+				<div class="card ">
+					<div class="table-responsive">
+						<table class="table table-bordered">
+							<thead> 
+								<tr>
+									<th colspan="15"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+								</tr>
+								<tr>
+									<th style='text-align:center;'>Sr</th>
+									<th style='text-align:center;'>Date</th>
+									<th style='text-align:center;'>Void Amount</th>
+									<th style='text-align:center;'>Mpu Sales</th>
+									<th style='text-align:center;'>Master Sales</th>
+									<th style='text-align:center;'>Visa Sales</th>
+									<th style='text-align:center;'>Jcb Sales</th>
+									<th style='text-align:center;'>Redeem Sales</th>
+									<th style='text-align:center;'>Cash Sales</th>
+									<th style='text-align:center;'>Credit Sales</th>
+									<th style='text-align:center;'>FOC Sales</th>
+									<th style='text-align:center;'>(Discount)</th>
+									<th style='text-align:center;'>Grand Total + <br/> Rounding Adj.</th>     
+									<th style='text-align:center;'>Rounding Adj.</th>
+									<th style='text-align:center;'>Grand Total</th>     	        
+								</tr>
+							</thead>
+							<% unless @sale_data.empty? %>
+
+							<tbody>
+								<% void   = 0 %>
+								<% mpu    = 0 %>
+								<% master = 0 %>
+								<% visa   = 0 %>
+								<% jcb    = 0 %>
+								<% paypar = 0 %>
+								<% cash   = 0 %>
+								<% credit = 0 %>
+								<% foc    = 0 %>
+								<% discount = 0 %>
+								<% total    = 0 %>
+								<% grand_total = 0 %> 
+								<% old_grand_total = 0 %>  
+								<% count = 1 %> <% rounding_adj = 0 %>
+								<% @sale_data.each do |sale| %>
+								<% void += sale[:void_amount] %>
+								<% mpu += sale[:mpu_amount] %>
+								<% master += sale[:master_amount] %>
+								<% visa += sale[:visa_amount] %>
+								<% jcb += sale[:jcb_amount] %>
+								<% paypar += sale[:paypar_amount] %>
+								<% cash += sale[:cash_amount]-sale[:total_change_amount] %>
+								<% credit += sale[:credit_amount] %>   
+								<% foc += sale[:foc_amount] %>
+								<% discount += sale[:total_discount] %>
+								<% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f  %>
+								<% grand_total += sale[:grand_total].to_f  %>	
+								<% old_grand_total += sale[:old_grand_total].to_f  %>	
+								<% rounding_adj += sale[:rounding_adj].to_f %>	
+								<tr>
+									<td style='text-align:right;'><%= count %></td>
+									<td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
+									<td style='color:red;text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%></td>	   	
+								</tr>
+								<% count = count + 1 %>
+								<% end %>
+
+								<tr style="font-weight:600;">
+									<td colspan="3" style='text-align:center;'>Total</td>	
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%></td>   
+								</tr>
+
+								<% total_tax = 0 %>
+								<% unless @tax.empty? %>
+								<% @tax.each do |tax| %>
+								<% total_tax += tax.tax_amount.to_f %>
+								<tr style="font-weight:600;">
+									<td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%></td>
+									<td colspan="2">&nbsp;</td>
+								</tr>
+
+								<% end %>
+								<% net = total - total_tax %>
+								<tr style="font-weight:600;">
+									<td colspan="12" style='text-align:right;'>Net Amount</td>
+									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
+									<td colspan="2">&nbsp;</td>	
+								</tr>
+								<% end %>
+							</tbody>
+							<% end %>
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
+
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
index c6308a66..30b58810 100644
--- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
@@ -1,130 +1,125 @@
-<div class="row">
-	<div class="col-md-12">
-			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-				<% if period_type != false %>
-					<div class="row">
-						<div class="form-group col-md-2">
-							<label>Select Period</label>
-							<select name="period" id="sel_period" class="form-control">
-							    <option value="">Select Period</option>
-								<option value="0">Today</option>
-								<option value="1">Yesterday</option>
-								<option value="2">This week</option>
-								<option value="3">Last week</option>
-								<option value="4">Last 7 days</option>
-								<option value="5">This month</option>
-								<option value="6">Last month</option>
-								<option value="7">Last 30 days</option>
-								<option value="8">This year</option>
-								<option value="9">Last year</option>
-							</select>
-						</div>
-						<% if defined? payments %>
-						<div class="form-group col-md-2">
-						<label>Select Payments</label>
-						<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
-						</div>
-					    <% end %>
-						<div class="form-group col-md-2">					
-							<!-- <label class="">Select Shift Period</label> -->
-				  			<label class="">From</label>
-							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-						</div>
-						<div class="form-group col-md-2">
-							<label class="">To</label>
-							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-						</div>
-						<div class="form-group col-md-2">
-						<label class="">All Shift</label>
-							<select class="form-control select" name="shift_name" id="shift_name" >
-							</select>
-						</div>
-						<div class="form-group col-md-1 margin-top-20">
-							<input type="submit" value="Generate Report" class='btn btn-primary'>
-						</div>							
-					</div>													
-				<% end %>
-				
-			<% end %>		
-	</div>
-</div>
+<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+		<div class="row">
+			<div class="form-group col-md-2">
+				<label>Select Period</label>
+				<select name="period" id="sel_period" class="form-control">
+					<option value="">Select Period</option>
+					<option value="0">Today</option>
+					<option value="1">Yesterday</option>
+					<option value="2">This week</option>
+					<option value="3">Last week</option>
+					<option value="4">Last 7 days</option>
+					<option value="5">This month</option>
+					<option value="6">Last month</option>
+					<option value="7">Last 30 days</option>
+					<option value="8">This year</option>
+					<option value="9">Last year</option>
+				</select>
+			</div>
+			<% if defined? payments %>
+			<div class="form-group col-md-2">
+				<label>Select Payments</label>
+				<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
+			</div>
+			<% end %>
+			<div class="form-group col-md-2">					
+				<!-- <label class="">Select Shift Period</label> -->
+				<label class="">From</label>
+				<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+			</div>
+			<div class="form-group col-md-2">
+				<label class="">To</label>
+				<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+			</div>
+			<div class="form-group col-md-2">
+				<label class="">All Shift</label>
+				<select class="form-control select" name="shift_name" id="shift_name" >
+				</select>
+			</div>
+			<div class="form-group col-md-1 margin-top-20">
+				<input type="submit" value="Generate Report" class='btn btn-primary'>
+			</div>							
+		</div>													
+	<% end %>
 
+<% end %>		
 
 <script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
+	$(function(){
+		$('#custom_excel').hide();
+		
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
 		// window.location = url;
 	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
+		
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+		
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
 
- <% if params[:shift_name].to_i > 0%>
+	<% if params[:shift_name].to_i > 0%>
 	shift_id = '<%= params[:shift_name] %>'
 	local_date = '<%= @shift_from %> - <%= @shift_to %> '
 	var shift = $('#shift_name');
 	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
 	shift.append(str);
-<% end %>
+	<% end %>
 
- $("#from").val("<%=params[:from] rescue '-'%>");
- $("#to").val("<%=params[:to] rescue '-'%>");
-  $("#sel_period").val(<%=params[:period] rescue '-'%>);
- $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
  // shift = $(".shift-id").text()
  // if (shift.length>0) {
  //  $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
  // }
 
-<% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
-<% else %>
-	$("#rd_period_type_0").attr("checked","checked");
-<% end %>
-$(".btn-group button").removeClass("active");
-<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-$("#btn_report_type_<%= report_type %>").addClass("active");
+ <% if params[:period_type] == 1 || params[:period_type] == "1" %>
+ $("#rd_period_type_1").attr("checked","checked");
+ <% else %>
+ $("#rd_period_type_0").attr("checked","checked");
+ <% end %>
+ $(".btn-group button").removeClass("active");
+ <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+ $("#btn_report_type_<%= report_type %>").addClass("active");
 
-$('#item').change(function(){
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
+ $('#item').change(function(){
+ 	var item = $('#item').val();
+ 	var payment_type = $('#payment_type');
 
-	if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();		
-		if(payment_type){
-			$('#payment_type').show();
-		}
-	}
-	else{
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}
-	}
-});
+ 	if(item == 'sale'){
+ 		$('#waiter').hide();
+ 		$('#cashier').show();		
+ 		if(payment_type){
+ 			$('#payment_type').show();
+ 		}
+ 	}
+ 	else{
+ 		$('#cashier').hide();
+ 		$('#waiter').show();
+ 		if(payment_type){
+ 			$('#payment_type').hide();
+ 		}
+ 	}
+ });
 </script>
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 5868d078..e847316e 100644
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -1,121 +1,125 @@
-<div class="page-header">
-	<ul class="breadcrumb">
-		<li><a href="<%= dashboard_path %>">Home</a></li>
-		<li>Receipt List Report</li>
-	</ul>
-</div>
+<div class="row">
+	<div class="col-md-12">
+		<div class="page-header">
+			<ul class="breadcrumb">
+				<li><a href="<%= dashboard_path %>">Home</a></li>
+				<li>Receipt List Report</li>
+			</ul>
+		</div>
 
-<div class="container">
-	<%= render :partial=>'shift_sale_report_filter',
-	:locals=>{ 	:period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %>
-	<hr />
-</div>
+		<!-- <div class="container"> -->
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %>
+		<hr />
+		<!-- </div> -->
 
- <div class="container">
-	<div class="row">
-		<div class="col-md-12 text-right">
-			<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
-		</div>	  			
-	</div>
-</div> 
+		<!-- <div class="container"> -->
+		<!-- <div class="row"> -->
+			<div class="text-right">
+				<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+			</div>	  			
+		<!-- </div> -->
+		<!-- </div> --> 
 
-<div class="container margin-top-20">
-	<div class="card row">
-		<table class="table table-striped" border="0">
-			<thead>
-				
-					<tr>
-				        <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-				   </tr>
-					<% if @shift_from %>
-					<tr>
-						<% if @shift_data.employee %>		
-						<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-						<% end %>			
-						<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
-					</tr>
-					<% end %>	 
+		<div class="margin-top-20">
+			<div class="card">
+				<table class="table table-striped" border="0">
+					<thead>
 
-				<tr>
-					<th>Recipt No</th>
-					<th>Cashier Name</th>		
-					<th>Total Amount</th>
-					<th>Discount Amount </th>
-					<% @sale_taxes.each do |tax| %>
-					<th><%= tax.tax_name %></th>		
-					<% end %>
-					<!-- <th>Other Amount</th> -->
-					<th>Grand Total</th>
-					<th>Rounding Adj.</th>
-					<th>Grand Total +<br/>
-						Rounding Adj.
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				<% grand_total = 0 %>
-				<% old_grand_total = 0 %>
-				<% total_tax = 0 %>
-				<% guest_count = 0 %>
-				<% total_sum = 0 %>	
-				<% discount_amt = 0 %>		    
-				<% other_amt = 0 %>
-				<% total_nett = 0 %>	 
-				<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
-				<%if @sale_data %> 
-					<% @sale_data.each do |result| %>
+						<tr>
+							<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+						</tr>
+						<% if @shift_from %>
+						<tr>
+							<% if @shift_data.employee %>		
+							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+							<% end %>			
+							<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+						</tr>
+						<% end %>	 
 
-					<% grand_total = grand_total.to_f + result.grand_total.to_f %>
-					<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
-					<% total_tax += result.total_tax.to_f %>
-					<% total_sum += result.total_amount.to_f %>	
-					<% discount_amt += result.total_discount.to_f %>
-					<% rounding_adj += result.rounding_adjustment.to_f %>
-					
-					<tr>
-						
-						<td><%= result.receipt_no rescue '-' %> </td>
-						<td><%= result.cashier_name rescue '-' %></td>
-						<td><%= result.total_amount rescue '-' %></td>
-						<td><%= result.total_discount rescue '-' %></td>
-						<% result.sale_taxes.each do |tax| %>
+						<tr>
+							<th>Recipt No</th>
+							<th>Cashier Name</th>		
+							<th>Total Amount</th>
+							<th>Discount Amount </th>
+							<% @sale_taxes.each do |tax| %>
+							<th><%= tax.tax_name %></th>		
+							<% end %>
+							<!-- <th>Other Amount</th> -->
+							<th>Grand Total</th>
+							<th>Rounding Adj.</th>
+							<th>Grand Total +<br/>
+								Rounding Adj.
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% grand_total = 0 %>
+						<% old_grand_total = 0 %>
+						<% total_tax = 0 %>
+						<% guest_count = 0 %>
+						<% total_sum = 0 %>	
+						<% discount_amt = 0 %>		    
+						<% other_amt = 0 %>
+						<% total_nett = 0 %>	 
+						<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
+						<%if @sale_data %> 
+						<% @sale_data.each do |result| %>
+
+						<% grand_total = grand_total.to_f + result.grand_total.to_f %>
+						<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+						<% total_tax += result.total_tax.to_f %>
+						<% total_sum += result.total_amount.to_f %>	
+						<% discount_amt += result.total_discount.to_f %>
+						<% rounding_adj += result.rounding_adjustment.to_f %>
+
+						<tr>
+
+							<td><%= result.receipt_no rescue '-' %> </td>
+							<td><%= result.cashier_name rescue '-' %></td>
+							<td><%= result.total_amount rescue '-' %></td>
+							<td><%= result.total_discount rescue '-' %></td>
+							<% result.sale_taxes.each do |tax| %>
 							<td><%= tax.tax_payable_amount rescue '-' %></td>
-						<%end%>
-						
-						<td><%= result.old_grand_total %></td>			
-						<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-						<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
-					</tr>
+							<%end%>
 
-					<% end %>
-					<tr style="border-top:4px double #666;">
-						<td colspan="2">&nbsp;</td>
-						<td><b><%= total_sum  rescue '-'%></b></td>
-						<td><b><%= discount_amt  rescue '-'%></b></td>
-						<% @sale_taxes.each do |tax| %>
+							<td><%= result.old_grand_total %></td>			
+							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
+							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+						</tr>
+
+						<% end %>
+						<tr style="border-top:4px double #666;">
+							<td colspan="2">&nbsp;</td>
+							<td><b><%= total_sum  rescue '-'%></b></td>
+							<td><b><%= discount_amt  rescue '-'%></b></td>
+							<% @sale_taxes.each do |tax| %>
 							<td><b><%= tax.st_amount.round(2) %></b></td>
-						<% end %>
-						<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
-						<td><b><%= rounding_adj  rescue '-'%></b></td>		
-						<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
-					</tr>
-					<tr>
-						<td colspan="2">&nbsp;</td>
-						<td>Total Amount</td>
-						<td>Discount Amount</td>
-						<% @sale_taxes.each do |tax| %>
+							<% end %>
+							<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
+							<td><b><%= rounding_adj  rescue '-'%></b></td>		
+							<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
+						</tr>
+						<tr>
+							<td colspan="2">&nbsp;</td>
+							<td>Total Amount</td>
+							<td>Discount Amount</td>
+							<% @sale_taxes.each do |tax| %>
 							<td><%= tax.tax_name %></td>
-						<% end %>
-						<td>Grand Total</td>
-						<td>Rounding Adj.</td>
-						<td>Grand Total +<br/>
-							Rounding Adj.
-						</td>
-					</tr>
-				<%end%>
-		</tbody>
-	</table>
-</div>
+							<% end %>
+							<td>Grand Total</td>
+							<td>Rounding Adj.</td>
+							<td>Grand Total +<br/>
+								Rounding Adj.
+							</td>
+						</tr>
+						<%end%>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
 </div>
 
 <script>
diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
index eddebc64..4cb14556 100644
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -1,5 +1,4 @@
-<div class="row">
-	<div class="col-md-12">
+
 			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 				<% if period_type != false %>
 					<div class="row">
@@ -52,8 +51,7 @@
 				<% end %>
 				
 			<% end %>		
-	</div>
-</div>
+
 <script type="text/javascript">
 $(function(){
 	$('#custom_excel').hide();
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 89c1c076..06f2af00 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -1,175 +1,179 @@
-<div class="page-header">
+<div class="row">
+	<div class="col-md-12">
+		<div class="page-header">
 
- <ul class="breadcrumb">
-  <li><a href="<%= dashboard_path %>">Home</a></li>
-  <li>Sale Item Report</li>
- </ul>
-</div>
+			<ul class="breadcrumb">
+				<li><a href="<%= dashboard_path %>">Home</a></li>
+				<li>Sale Item Report</li>
+			</ul>
+		</div>
 
-<div class="container">
-	<%= render :partial=>'shift_sale_report_filter',
-	:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %>
+		<!-- <div class="container"> -->
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %>
 
-	<hr />
-</div>
+		<hr />
+		<!-- /div> -->
 
-<div class="container">
-	<div class="row">
-		<div class="col-md-12 text-right">
-			<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
-		</div>	  			
+		<!-- <div class="container"> -->
+		<!-- <div class="row"> -->
+			<div class="text-right">
+				<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+			</div>	  			
+		<!-- </div> -->
+		<!-- </div> -->
+
+		<div class="margin-top-20">
+			<div class="card">
+				<div class="table-responsive">
+					
+
+					<table class="table table-striped" id="items_table" border="0">
+						<thead>
+
+							<tr>
+								<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							</tr>
+							<% if @shift_from %>
+							<tr>
+								<% if @shift_data.employee %>		
+								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+								<% end %>			
+								<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							</tr>
+							<% end %>
+							<tr>
+								<th>&nbsp;</th>
+								<th>Menu Category</th>
+								<th>Code</th>
+								<th>Product</th>
+								<th>Total Item</th>
+								<th>Unit Price</th>
+								<th>Revenue</th>
+							</tr>	
+						</thead>
+						<tbody>
+							<% unless @sale_data.blank? %>
+							<% acc_arr = Array.new %>
+							<% cate_arr = Array.new %>	 
+
+							<% sub_total = 0.0 %>
+							<% count = 0%>
+							<% total_price = 0.0 %>
+							<% cate_count = 0 %>
+							<% acc_count = 0%>
+							<% grand_total = 0%>
+							<% total_qty = 0%>
+							<% total_amount = 0 %>
+							<% discount = 0%>
+
+							<% @sale_data.each do |sale| %>
+							<% total_qty += sale.total_item %>	  
+
+							<% if !acc_arr.include?(sale.account_id) %>
+							<tr>
+								<td><b><%= sale.account_name %></b></td>
+								<td colspan="4">&nbsp;</td>
+								<td>Total Price By <%= sale.account_name %></td>
+								<td>
+									<% @totalByAccount.each do |account, total| %>
+									<% if sale.account_id == account %>
+									<b><%= total %></b>
+									<% grand_total += total %>	  
+									<% end %>
+									<% end %>
+								</td>
+							</tr>
+							<% acc_arr.push(sale.account_id) %>
+
+							<% end %>
+							<tr>
+								<td>&nbsp;</td>
+								<% if !cate_arr.include?(sale.menu_category_id) %>	
+								<td><%= sale.menu_category_name %></td>
+								<% cate_arr.push(sale.menu_category_id) %>
+								<% else %>
+								<td>&nbsp;</td>
+								<% end %>
+								<td><%= sale.item_code rescue '-' %></td>
+								<td><%= sale.product_name rescue '-' %></td>
+								<td><%= sale.total_item rescue '-' %></td>
+								<td><%= sale.unit_price rescue '-' %></td>
+								<td><%= sale.grand_total rescue '-' %></td>
+
+							</tr>
+
+							<!-- sub total -->
+							<% @menu_cate_count.each do |key,value| %>
+							<% if sale.menu_category_id == key %>
+
+							<% count = count + 1 %>	
+							<% sub_total += sale.grand_total %>
+							<% if count == value %>	
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Sub Total</td>
+								<td ><span class="underline"><%= sub_total %></span></td>
+
+							</tr>
+							<% sub_total = 0.0%>
+							<% count = 0%>
+							<% end %>
+							<% end %>
+							<% end %>
+
+							<!-- end sub total -->
+
+							<% end %>
+
+							<tr style="border-top:2px solid grey;">
+								<td colspan="3">&nbsp;</td>
+								<td>Total Item</td>
+								<td><span><%= total_qty%></span></td>
+								<td>Total Amount</td>
+								<td><span><%= grand_total%></span></td> 
+							</tr>
+							<% end %>
+
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Cash Received</td>
+								<td><span><%= @cash_data - @change_amount %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Card Sales</td>
+								<td><span><%= @card_data %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Credit Sales</td>
+								<td><span><%= @credit_data %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td>FOC Sales</td>
+								<td><span><%= @foc_data %></span></td>
+							</tr>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Discount Amount</td>
+								<td><span><%= @discount_data %></span></td>
+							</tr>		
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Grand Total</td>
+								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
+								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
 	</div>
 </div>
 
-<div class="container margin-top-20">
-	<div class="card row">
-		<div class="table-responsive">
-			
-
-			<table class="table table-striped" id="items_table" border="0">
-				<thead>
-
-					<tr>
-				        <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-				   </tr>
-					<% if @shift_from %>
-					<tr>
-						<% if @shift_data.employee %>		
-						<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-						<% end %>			
-						<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
-					</tr>
-					<% end %>
-					<tr>
-						<th>&nbsp;</th>
-						<th>Menu Category</th>
-						<th>Code</th>
-						<th>Product</th>
-						<th>Total Item</th>
-						<th>Unit Price</th>
-						<th>Revenue</th>
-					</tr>	
-				</thead>
-				<tbody>
-				<% unless @sale_data.blank? %>
-					<% acc_arr = Array.new %>
-					<% cate_arr = Array.new %>	 
-
-					<% sub_total = 0.0 %>
-					<% count = 0%>
-					<% total_price = 0.0 %>
-					<% cate_count = 0 %>
-					<% acc_count = 0%>
-					<% grand_total = 0%>
-					<% total_qty = 0%>
-					<% total_amount = 0 %>
-					<% discount = 0%>
-
-					<% @sale_data.each do |sale| %>
-					<% total_qty += sale.total_item %>	  
-
-					<% if !acc_arr.include?(sale.account_id) %>
-					<tr>
-						<td><b><%= sale.account_name %></b></td>
-						<td colspan="4">&nbsp;</td>
-						<td>Total Price By <%= sale.account_name %></td>
-						<td>
-							<% @totalByAccount.each do |account, total| %>
-							<% if sale.account_id == account %>
-							<b><%= total %></b>
-							<% grand_total += total %>	  
-							<% end %>
-							<% end %>
-						</td>
-					</tr>
-					<% acc_arr.push(sale.account_id) %>
-
-					<% end %>
-					<tr>
-						<td>&nbsp;</td>
-						<% if !cate_arr.include?(sale.menu_category_id) %>	
-						<td><%= sale.menu_category_name %></td>
-						<% cate_arr.push(sale.menu_category_id) %>
-						<% else %>
-						<td>&nbsp;</td>
-						<% end %>
-						<td><%= sale.item_code rescue '-' %></td>
-						<td><%= sale.product_name rescue '-' %></td>
-						<td><%= sale.total_item rescue '-' %></td>
-						<td><%= sale.unit_price rescue '-' %></td>
-						<td><%= sale.grand_total rescue '-' %></td>
-
-					</tr>
-
-					<!-- sub total -->
-					<% @menu_cate_count.each do |key,value| %>
-					<% if sale.menu_category_id == key %>
-
-					<% count = count + 1 %>	
-					<% sub_total += sale.grand_total %>
-					<% if count == value %>	
-					<tr>
-						<td colspan="5">&nbsp;</td>
-						<td>Sub Total</td>
-						<td ><span class="underline"><%= sub_total %></span></td>
-
-					</tr>
-					<% sub_total = 0.0%>
-					<% count = 0%>
-					<% end %>
-					<% end %>
-					<% end %>
-
-					<!-- end sub total -->
-
-					<% end %>
-
-					<tr style="border-top:2px solid grey;">
-						<td colspan="3">&nbsp;</td>
-						<td>Total Item</td>
-						<td><span><%= total_qty%></span></td>
-						<td>Total Amount</td>
-						<td><span><%= grand_total%></span></td> 
-					</tr>
-				<% end %>
-
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Cash Received</td>
-		<td><span><%= @cash_data - @change_amount %></span></td>
-	</tr>
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Card Sales</td>
-		<td><span><%= @card_data %></span></td>
-	</tr>
-		<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Credit Sales</td>
-		<td><span><%= @credit_data %></span></td>
-	</tr>
-		<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>FOC Sales</td>
-		<td><span><%= @foc_data %></span></td>
-	</tr>
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Discount Amount</td>
-		<td><span><%= @discount_data %></span></td>
-	</tr>		
-	<tr>
-		<td colspan="5">&nbsp;</td>
-		<td>Grand Total</td>
-		<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-		 <td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
-	</tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
-
 <script>
 	$(function(){
 
@@ -273,5 +277,5 @@
 			});
 		}
 
-});
+	});
 </script>
\ No newline at end of file
diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
index 1ccf99ad..5e5ae1bb 100644
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -1,87 +1,85 @@
-<div class="row">
-	<div class="col-md-12">
-			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-				<% if period_type != false %>
-					<div class="row">
-						<div class="form-group col-md-2">
-							<label>Select Period</label>
-							<select name="period" id="sel_period" class="form-control">
-								<option value="0">Today</option>
-								<option value="1">Yesterday</option>
-								<option value="2">This week</option>
-								<option value="3">Last week</option>
-								<option value="4">Last 7 days</option>
-								<option value="5">This month</option>
-								<option value="6">Last month</option>
-								<option value="7">Last 30 days</option>
-								<option value="8">This year</option>
-								<option value="9">Last year</option>
-							</select>
-						</div>
-					
-						<div class="form-group col-md-3">					
-							<!-- <label class="">Select Shift Period</label> -->
-				  			<label class="">From</label>
-							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-						</div>
-						<div class="form-group col-md-3">
-							<label class="">To</label>
-							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-						</div>
-						<div class="form-group col-md-2">
-						<label class="">All Shift</label>
-							<select class="form-control select" name="shift_name" id="shift_name" >
-							</select>
-						</div>
-						<div class="form-group col-md-2 margin-top-20">
-							<input type="submit" value="Generate Report" class='btn btn-primary'>
-						</div>							
-					</div>													
-				<% end %>
-				
-			<% end %>		
-	</div>
-</div>
+
+<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+		<div class="row">
+			<div class="form-group col-md-2">
+				<label>Select Period</label>
+				<select name="period" id="sel_period" class="form-control">
+					<option value="0">Today</option>
+					<option value="1">Yesterday</option>
+					<option value="2">This week</option>
+					<option value="3">Last week</option>
+					<option value="4">Last 7 days</option>
+					<option value="5">This month</option>
+					<option value="6">Last month</option>
+					<option value="7">Last 30 days</option>
+					<option value="8">This year</option>
+					<option value="9">Last year</option>
+				</select>
+			</div>
+			
+			<div class="form-group col-md-3">					
+				<!-- <label class="">Select Shift Period</label> -->
+				<label class="">From</label>
+				<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+			</div>
+			<div class="form-group col-md-3">
+				<label class="">To</label>
+				<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+			</div>
+			<div class="form-group col-md-2">
+				<label class="">All Shift</label>
+				<select class="form-control select" name="shift_name" id="shift_name" >
+				</select>
+			</div>
+			<div class="form-group col-md-2 margin-top-20">
+				<input type="submit" value="Generate Report" class='btn btn-primary'>
+			</div>							
+		</div>													
+	<% end %>
+
+<% end %>		
+
 
 <script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
+	$(function(){
+		$('#custom_excel').hide();
+		
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
 		// window.location = url;
 	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
+		
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+		
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
 
 //Reset the form to pervious values
 <% if params[:shift_name].to_i > 0%>
-	shift_id = '<%= params[:shift_name] %>'
-	local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>'
-	var shift = $('#shift_name');
-	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
-	shift.append(str);
+shift_id = '<%= params[:shift_name] %>'
+local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>'
+var shift = $('#shift_name');
+str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+shift.append(str);
 <% end %>
 $("#from").val("<%=params[:from]%>");
 $("#to").val("<%=params[:to]%>");
@@ -89,9 +87,9 @@ $("#sel_period").val(<%=params[:period]%>);
 $("#sel_sale_type").val(<%=params[:sale_type]%>);
 
 <% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
+$("#rd_period_type_1").attr("checked","checked");
 <% else %>
-	$("#rd_period_type_0").attr("checked","checked");
+$("#rd_period_type_0").attr("checked","checked");
 <% end %>
 $(".btn-group button").removeClass("active");
 <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 755511ab..8e23170a 100644
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -1,119 +1,121 @@
-<div class="page-header">
- <ul class="breadcrumb">
-  <li><a href="<%= dashboard_path %>">Home</a></li>
-  <li>Shift Sale Report</li>
- </ul>
-</div>
+<div class="row">
+	<div class="col-md-12">
+		<div class="page-header">
+			<ul class="breadcrumb">
+				<li><a href="<%= dashboard_path %>">Home</a></li>
+				<li>Shift Sale Report</li>
+			</ul>
+		</div>
 
-<div class="container">
-    <%= render :partial=>'shift_sale_report_filter',
-    		   :locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %>
-	<hr />
-</div>
+		<!-- <div class="container"> -->
+			<%= render :partial=>'shift_sale_report_filter',
+			:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %>
+			<hr />
+		<!-- </div> -->
 
-<div class="container">
-	<div class="row">
-		<div class="col-md-12 text-right">
-			<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
-		</div>	  			
-	</div>
-</div>
+		<!-- <div class="container"> -->
+			<!-- <div class="row"> -->
+			<div class="text-right">
+					<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+				</div>	  			
+			<!-- </div> -->
+		<!-- </div> -->
 
-<div class="container margin-top-20">
+		<div class="margin-top-20">
     <!-- <div class="span11">
 		<div id="report_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div>
 	</div> -->
-	<div class="card row">
-	    <div class="table-responsive">
+	<div class="card">
+		<div class="table-responsive">
 			<table class="table table-striped">
-			  <thead>
-			  	<tr>
-			  		<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  
-			  		- To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%>
-			  			
-			  		</th>
-			  	</tr>
-				<% if @shift_from %>
+				<thead>
+					<tr>
+						<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  
+							- To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%>
+
+						</th>
+					</tr>
+					<% if @shift_from %>
 					<tr>
 						<% if @shift_data.employee %>		
 						<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
 						<% end %>			
 						<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 					</tr>
-				<% end %>	  
-			    <tr>
-					<th>Cashier Station</th>
-					<th>Cashier Name</th>
-			        <th>Shift Name</th>		
-					<!-- <th>Void Amount</th> -->
-					<th>Cash Payment</th>
-					<!-- <th>Credit Charges</th> -->
-					<th>Credit Payment</th>
-					<!-- <th>FOC Payment</th> -->
-					<th>Other Payment</th>
+					<% end %>	  
+					<tr>
+						<th>Cashier Station</th>
+						<th>Cashier Name</th>
+						<th>Shift Name</th>		
+						<!-- <th>Void Amount</th> -->
+						<th>Cash Payment</th>
+						<!-- <th>Credit Charges</th> -->
+						<th>Credit Payment</th>
+						<!-- <th>FOC Payment</th> -->
+						<th>Other Payment</th>
 					<!-- <th>Grand Total 
-						<br/>Rounding Adj</th> -->						
+					<br/>Rounding Adj</th> -->						
 					<!-- <th>Rounding Adj</th> -->
 					<th>Grand Total</th>		
-			    </tr>
-			  </thead>
-			  <tbody>
-				  <% void = 0%>	  
-				  <% cash = 0%>	  
-				  <% credit = 0%>	  
-				  <% accept_credit = 0%>	  
-				  <% foc = 0%>	  
-				  <% card = 0%>
-			  	  <% total = 0%> 
-			  	  <% rounding_adj = 0%> 
-			  	  <% g_total = 0 %>
+				</tr>
+			</thead>
+			<tbody>
+				<% void = 0%>	  
+				<% cash = 0%>	  
+				<% credit = 0%>	  
+				<% accept_credit = 0%>	  
+				<% foc = 0%>	  
+				<% card = 0%>
+				<% total = 0%> 
+				<% rounding_adj = 0%> 
+				<% g_total = 0 %>
 
-			    <% @sale_data.each do |result|%>
-			        <tr>
-			  		  <td>
-			  			  <%= result.cashier_terminal.name  rescue '-'%>
-			  		  </td>
-			  		  <td>
-			  			  <%= result.employee.name  rescue '-'%>
-			  		  </td>
-				  	  <td><%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> -  
-						  <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-'  %>
-					  </td>
-					  <!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-					  <td><%= sprintf "%.2f",result.cash_sales.to_f.to_d  rescue '-'%></td>
-					  <td><%= sprintf "%.2f",result.credit_sales.to_f.to_d  rescue '-'%></td>
-					  <!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
+				<% @sale_data.each do |result|%>
+				<tr>
+					<td>
+						<%= result.cashier_terminal.name  rescue '-'%>
+					</td>
+					<td>
+						<%= result.employee.name  rescue '-'%>
+					</td>
+					<td><%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> -  
+						<%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-'  %>
+					</td>
+					<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
+					<td><%= sprintf "%.2f",result.cash_sales.to_f.to_d  rescue '-'%></td>
+					<td><%= sprintf "%.2f",result.credit_sales.to_f.to_d  rescue '-'%></td>
+					<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
 					  <!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
 					  <td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
 					  <td><%= sprintf "%.2f",result.other_sales.to_f.to_d  rescue '-'%></td>	  		  
 					  <td><%= sprintf "%.2f",result.grand_total.to_f.to_d  rescue '-'%></td>	
 
-					 <!--  <td><%= sprintf "%.2f",result.rounding_adj.to_f.to_d  rescue '-'%></td>	 -->
+					  <!--  <td><%= sprintf "%.2f",result.rounding_adj.to_f.to_d  rescue '-'%></td>	 -->
 					  <% grand_total = result.grand_total.to_f %>	  
-					 <!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
-			      </tr>
-				  <% cash += result.cash_sales.to_f %>
-				  <% credit += result.credit_sales.to_f %>
-				  <% card += result.other_sales.to_f %>	
-				 
-				  <% total += result.grand_total.to_f %>	
-				  <% g_total += grand_total.to_f %>
+					  <!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
+					</tr>
+					<% cash += result.cash_sales.to_f %>
+					<% credit += result.credit_sales.to_f %>
+					<% card += result.other_sales.to_f %>	
 
-			    <% end %>
+					<% total += result.grand_total.to_f %>	
+					<% g_total += grand_total.to_f %>
 
-				<tr style="border-top: 3px solid grey;">
-					<td colspan="3"></td>
-					<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
-					<td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
-					<td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
-					<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
-					<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
-					<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
-					<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
-					<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
-					 <td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>	 			
-				</tr>
-			  </tbody>
+					<% end %>
+
+					<tr style="border-top: 3px solid grey;">
+						<td colspan="3"></td>
+						<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
+						<td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
+						<td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
+						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
+						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
+						<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
+						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
+						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
+						<td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>	 			
+					</tr>
+				</tbody>
 			</table>
 		</div>
 	</div>
diff --git a/app/views/reports/stock_check/_stock_check_report_filter.html.erb b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
index 1bd00b7b..01850483 100644
--- a/app/views/reports/stock_check/_stock_check_report_filter.html.erb
+++ b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
@@ -1,5 +1,4 @@
-<div class="row">
-  <div class="col-md-12">
+
     <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
         <% if period_type != false %>
             <div class="row">
@@ -38,8 +37,7 @@
         <% end %>
 
     <% end %>
-  </div>
-</div>
+
 
 <script type="text/javascript">
 
diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb
index 2a231fef..4d5c4335 100644
--- a/app/views/reports/stock_check/index.html.erb
+++ b/app/views/reports/stock_check/index.html.erb
@@ -1,87 +1,89 @@
-<div class="page-header">
-  <ul class="breadcrumb">
-    <li><a href="<%= dashboard_path %>">Home</a></li>
-    <li>Stock Check Report</li>
-  </ul>
-</div>
+<div class="row">
+  <div class="col-md-12">
+    <div class="page-header">
+      <ul class="breadcrumb">
+        <li><a href="<%= dashboard_path %>">Home</a></li>
+        <li>Stock Check Report</li>
+      </ul>
+    </div>
 
-<div class="container">
-  <%= render :partial => 'stock_check_report_filter',
-             :locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %>
-  <hr/>
-</div>
+    <!-- <div class="container"> -->
+    <%= render :partial => 'stock_check_report_filter',
+    :locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %>
+    <hr/>
+    <!-- </div> -->
 
-<div class="container">
-  <div class="row">
-    <div class="col-md-12 text-right">
+    <!-- <div class="container"> -->
+    <!-- <div class="row"> -->
+    <div class="text-right">
       <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-default">Export to
         Excel</a>
-    </div>
-  </div>
-</div>
+      </div>
+      <!-- </div> -->
+      <!-- </div> -->
 
-<div class="container margin-top-20">
-  <div class="card row">
-    <div class="table-responsive">
-      <table class="table table-striped">
-        <thead>
-        <tr>
-          <th colspan="8"><i> From Date </i>: <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <i>To Date</i> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
-        </tr>
-        <tr>
-          <th>Stock Check Reason</th>
-          <th>Checked By</th>
-          <th>Item Name</th>
-          <th>Stock Count</th>
-          <th>Stock Balance</th>
-          <th>Different</th>
-          <th>Remark</th>
-          <th>Date</th>
-        </tr>
-        </thead>
-        <tbody>
-        <% total_stock_count = 0 %>
-        <% total_stock_balance = 0 %>
-        <% total_different = 0 %>
+      <div class="margin-top-20">
+        <div class="card">
+          <div class="table-responsive">
+            <table class="table table-striped">
+              <thead>
+                <tr>
+                  <th colspan="8"><i> From Date </i>: <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <i>To Date</i> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
+                </tr>
+                <tr>
+                  <th>Stock Check Reason</th>
+                  <th>Checked By</th>
+                  <th>Item Name</th>
+                  <th>Stock Count</th>
+                  <th>Stock Balance</th>
+                  <th>Different</th>
+                  <th>Remark</th>
+                  <th>Date</th>
+                </tr>
+              </thead>
+              <tbody>
+                <% total_stock_count = 0 %>
+                <% total_stock_balance = 0 %>
+                <% total_different = 0 %>
 
-        <% @transaction.each do |result| %>
-            <tr>
-              <td><%= result.stock_check.reason rescue '-' %></td>
-              <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
-              <td>
-                <% menu_item = MenuItemInstance.find_by_item_instance_code(result.item_code)%>
-                <% if menu_item.nil? %>
+                <% @transaction.each do |result| %>
+                <tr>
+                  <td><%= result.stock_check.reason rescue '-' %></td>
+                  <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
+                  <td>
+                    <% menu_item = MenuItemInstance.find_by_item_instance_code(result.item_code)%>
+                    <% if menu_item.nil? %>
                     <%= Product.find_by_item_code(result.item_code).name rescue "-" %>
-                <% else %>
+                    <% else %>
                     <%= menu_item.menu_item.name rescue "-" %>
                     - <%= menu_item.item_instance_name rescue "-" %>
+                    <% end %>
+                  </td>
+                  <td><%= result.stock_count rescue '-' %></td>
+                  <td><%= result.stock_balance rescue '-' %></td>
+                  <td><%= result.different rescue '-' %></td>
+                  <td><%= result.remark rescue '-' %></td>
+                  <td><%= result.created_at.strftime('%e %b %Y %I:%M %p') rescue '-' %></td>
+                </tr>
+                <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
+                <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>
+                <% !result.different.nil? ? total_different += result.different : total_different += 0 %>
                 <% end %>
-              </td>
-              <td><%= result.stock_count rescue '-' %></td>
-              <td><%= result.stock_balance rescue '-' %></td>
-              <td><%= result.different rescue '-' %></td>
-              <td><%= result.remark rescue '-' %></td>
-              <td><%= result.created_at.strftime('%e %b %Y %I:%M %p') rescue '-' %></td>
-            </tr>
-            <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
-            <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>
-            <% !result.different.nil? ? total_different += result.different : total_different += 0 %>
-        <% end %>
 
-        <tr style="border-top: 3px solid grey;">
-          <td colspan="3"></td>
-          <td><b><%= total_stock_count rescue '-' %></b></td>
-          <td><b><%= total_stock_balance rescue '-' %></b></td>
-          <td><b><%= total_different rescue '-' %></b></td>
-          <td colspan="2"></td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
-<script>
-    $(function () {
+                <tr style="border-top: 3px solid grey;">
+                  <td colspan="3"></td>
+                  <td><b><%= total_stock_count rescue '-' %></b></td>
+                  <td><b><%= total_stock_balance rescue '-' %></b></td>
+                  <td><b><%= total_different rescue '-' %></b></td>
+                  <td colspan="2"></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+      <script>
+        $(function () {
 
-    });
-</script>
\ No newline at end of file
+        });
+      </script>
\ No newline at end of file
diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
index 5313e61d..3c03a537 100644
--- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
@@ -1,125 +1,120 @@
-<div class="row">
-	<div class="col-md-12">
-			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
-				<% if period_type != false %>
-					<div class="row">
-						<div class="form-group col-md-2">
-							<label>Select Period</label>
-							<select name="period" id="sel_period" class="form-control">
-							    <option value="">Select Period</option>
-								<option value="0">Today</option>
-								<option value="1">Yesterday</option>
-								<option value="2">This week</option>
-								<option value="3">Last week</option>
-								<option value="4">Last 7 days</option>
-								<option value="5">This month</option>
-								<option value="6">Last month</option>
-								<option value="7">Last 30 days</option>
-								<option value="8">This year</option>
-								<option value="9">Last year</option>
-							</select>
-						</div>
-						
-						<div class="form-group col-md-2">					
-							<!-- <label class="">Select Shift Period</label> -->
-				  			<label class="">From</label>
-							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
-						</div>
-						<div class="form-group col-md-2">
-							<label class="">To</label>
-							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
-						</div>
-						<div class="form-group col-md-3">
-						<label class="">All Shift</label>
-							<select class="form-control select" name="shift_name" id="shift_name" >
-							</select>
-						</div>
-						<div class="form-group col-md-1 margin-top-20">
-							<input type="submit" value="Generate Report" class='btn btn-primary'>
-						</div>							
-					</div>													
-				<% end %>
-				
-			<% end %>		
-	</div>
-</div>
 
+<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+	<% if period_type != false %>
+		<div class="row">
+			<div class="form-group col-md-2">
+				<label>Select Period</label>
+				<select name="period" id="sel_period" class="form-control">
+					<option value="">Select Period</option>
+					<option value="0">Today</option>
+					<option value="1">Yesterday</option>
+					<option value="2">This week</option>
+					<option value="3">Last week</option>
+					<option value="4">Last 7 days</option>
+					<option value="5">This month</option>
+					<option value="6">Last month</option>
+					<option value="7">Last 30 days</option>
+					<option value="8">This year</option>
+					<option value="9">Last year</option>
+				</select>
+			</div>
+
+			<div class="form-group col-md-2">					
+				<!-- <label class="">Select Shift Period</label> -->
+				<label class="">From</label>
+				<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+			</div>
+			<div class="form-group col-md-2">
+				<label class="">To</label>
+				<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+			</div>
+			<div class="form-group col-md-3">
+				<label class="">All Shift</label>
+				<select class="form-control select" name="shift_name" id="shift_name" >
+				</select>
+			</div>
+			<div class="form-group col-md-1 margin-top-20">
+				<input type="submit" value="Generate Report" class='btn btn-primary'>
+			</div>							
+		</div>													
+	<% end %>
+<% end %>
 
 <script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
+	$(function(){
+		$('#custom_excel').hide();
+
+		$('#custom_excel').click(function(){
+			var url = $('#custom_excel').attr('data-url');
+			$('#frm_report').attr('action',url)
+			$('#frm_report').submit();
 		// window.location = url;
 	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
 
- <% if params[:shift_name].to_i > 0%>
+		var item = $('#item').val();
+		var payment_type = $('#payment_type');
+
+		if(item == 'order'){
+			$('#cashier').hide();
+			$('#waiter').show();
+			if(payment_type){
+				$('#payment_type').hide();
+			}		
+		}
+		else if(item == 'sale'){
+			$('#waiter').hide();
+			$('#cashier').show();
+		}
+		else{
+			$('#waiter').hide();
+			$('#cashier').show();		
+			$("#item").val('sale');
+		}
+	});
+
+	<% if params[:shift_name].to_i > 0%>
 	shift_id = '<%= params[:shift_name] %>'
 	local_date = '<%= @shift_from %> - <%= @shift_to %> '
 	var shift = $('#shift_name');
 	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
 	shift.append(str);
-<% end %>
+	<% end %>
 
- $("#from").val("<%=params[:from] rescue '-'%>");
- $("#to").val("<%=params[:to] rescue '-'%>");
-  $("#sel_period").val(<%=params[:period] rescue '-'%>);
- $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+	$("#from").val("<%=params[:from] rescue '-'%>");
+	$("#to").val("<%=params[:to] rescue '-'%>");
+	$("#sel_period").val(<%=params[:period] rescue '-'%>);
+	$("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
  // shift = $(".shift-id").text()
  // if (shift.length>0) {
  //  $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
  // }
 
-<% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
-<% else %>
-	$("#rd_period_type_0").attr("checked","checked");
-<% end %>
-$(".btn-group button").removeClass("active");
-<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-$("#btn_report_type_<%= report_type %>").addClass("active");
+ <% if params[:period_type] == 1 || params[:period_type] == "1" %>
+ $("#rd_period_type_1").attr("checked","checked");
+ <% else %>
+ $("#rd_period_type_0").attr("checked","checked");
+ <% end %>
+ $(".btn-group button").removeClass("active");
+ <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+ $("#btn_report_type_<%= report_type %>").addClass("active");
 
-$('#item').change(function(){
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
+ $('#item').change(function(){
+ 	var item = $('#item').val();
+ 	var payment_type = $('#payment_type');
 
-	if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();		
-		if(payment_type){
-			$('#payment_type').show();
-		}
-	}
-	else{
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}
-	}
-});
+ 	if(item == 'sale'){
+ 		$('#waiter').hide();
+ 		$('#cashier').show();		
+ 		if(payment_type){
+ 			$('#payment_type').show();
+ 		}
+ 	}
+ 	else{
+ 		$('#cashier').hide();
+ 		$('#waiter').show();
+ 		if(payment_type){
+ 			$('#payment_type').hide();
+ 		}
+ 	}
+ });
 </script>
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index 53f8ff46..5f2557cc 100644
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -1,99 +1,97 @@
-<div class="page-header">
-	<ul class="breadcrumb">
-		<li><a href="<%= dashboard_path %>">Home</a></li>
-		<li>Void Sale Report</li>
-	</ul>
-</div>
+<div class="row">
+	<div class="col-md-12">
+		<div class="page-header">
+			<ul class="breadcrumb">
+				<li><a href="<%= dashboard_path %>">Home</a></li>
+				<li>Void Sale Report</li>
+			</ul>
+		</div>
 
-<div class="container">
-	<%= render :partial=>'shift_sale_report_filter',
-	:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %>
-	<hr />
-</div>
+		<!-- <div class="container"> -->
+		<%= render :partial=>'shift_sale_report_filter',
+		:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %>
+		<hr />
+		<!-- </div> -->
 
- <div class="container">
-	<div class="row">
+		<!-- <div class="container"> -->
+		<!-- <div class="row"> -->
 		<div class="col-md-12 text-right">
 			<a href="javascript:export_to('<%=reports_void_sale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
 		</div>	  			
-	</div>
-</div> 
+		<!-- </div> -->
+		<!-- </div>  -->
 
-<div class="container margin-top-20">
-	<div class="card row">
-		<% if @sale_data.count > 0 %>
-	<table class="table table-striped" border="0">
-	  <thead>
-	  	<% if !params[:from].blank?%>
-	      <tr>
-	          <th colspan="7">From Date : <%= params[:from]  rescue '-'%>	,	To Date : <%= params[:to]  rescue '-'%></th>
-	  	</tr>
-	  	<% end %>
-	  	<% if @shift_from %>
-	  	<tr>
-			<% if @shift %>		
-				<% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %>
-			<% end %>	
-	  		<th colspan="3">Shift Name =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
-	      </tr>
-	  	<% end %>		  
-	    <tr>
-			<th>Receipt No</th>
-			<th>Sale Date</th>
-			<th>Total Amount</th>
-			<th>Grand Total</th>
-			<th>Rounding Adj.</th>
-			<th>Grand Total + <br/>Rounding Adj.</th>			
-			<!-- <th>Sale Status</th> -->
-	    </tr>
-	  </thead>
-	  <tbody>
-	  <% total_amount = 0.0 %>
-	  <% grand_total = 0.0 %>
-	  <% rounding_adjustment = 0.0 %>
-	  <% grand_rounding_adjustment = 0.0 %>
-		<% @sale_data.each do |result| %>
-			<% result[:items].each do |item| %>
-			<tr>
-				<td><%= item.receipt_no rescue '-' %> </td>
-				<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
-				<td><%= item.total_amount.to_f  rescue '-'%> </td>
-				<td><%= item.grand_total.to_f  rescue '-'%> </td>
-				<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
-				<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
-				<!-- <td><%= result.sales_status rescue '-' %> </td> -->
-				<!-- <td><%= item.remarks rescue '-' %> </td> -->
-			</tr>
-			<% total_amount = total_amount.to_f + item.total_amount.to_f %>
-			<% grand_total = grand_total.to_f + item.grand_total.to_f %>
-			<% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %>
-			<% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %>
-			<% end %>
-		<% end %>
-		<tr style="border-top:4px double #666;font-weight:600;">
-	    	<td colspan="2" style="text-align:center;">Total Void Amount :</td>
-	    	<td><%= total_amount rescue '-' %></td>
-	    	<td><%= grand_total rescue '-' %></td>
-	    	<td><%= rounding_adjustment  rescue '-'%></td>
-	    	<td colspan="3"><%= grand_rounding_adjustment  rescue '-'%></td>
-	    </tr>
-	  </tbody>
-	</table>
-<% end %>
-	</div>
-</div>
+		<div class="margin-top-20">
+			<div class="card">
+				<% if @sale_data.count > 0 %>
+				<table class="table table-striped" border="0">
+					<thead>
+						<% if !params[:from].blank?%>
+						<tr>
+							<th colspan="7">From Date : <%= params[:from]  rescue '-'%>	,	To Date : <%= params[:to]  rescue '-'%></th>
+						</tr>
+						<% end %>
+						<% if @shift_from %>
+						<tr>
+							<% if @shift %>		
+							<% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %>
+							<% end %>	
+							<th colspan="3">Shift Name =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
+						</tr>
+						<% end %>		  
+						<tr>
+							<th>Receipt No</th>
+							<th>Sale Date</th>
+							<th>Total Amount</th>
+							<th>Grand Total</th>
+							<th>Rounding Adj.</th>
+							<th>Grand Total + <br/>Rounding Adj.</th>			
+							<!-- <th>Sale Status</th> -->
+						</tr>
+					</thead>
+					<tbody>
+						<% total_amount = 0.0 %>
+						<% grand_total = 0.0 %>
+						<% rounding_adjustment = 0.0 %>
+						<% grand_rounding_adjustment = 0.0 %>
+						<% @sale_data.each do |result| %>
+						<% result[:items].each do |item| %>
+						<tr>
+							<td><%= item.receipt_no rescue '-' %> </td>
+							<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
+							<td><%= item.total_amount.to_f  rescue '-'%> </td>
+							<td><%= item.grand_total.to_f  rescue '-'%> </td>
+							<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
+							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
+							<!-- <td><%= result.sales_status rescue '-' %> </td> -->
+							<!-- <td><%= item.remarks rescue '-' %> </td> -->
+						</tr>
+						<% total_amount = total_amount.to_f + item.total_amount.to_f %>
+						<% grand_total = grand_total.to_f + item.grand_total.to_f %>
+						<% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %>
+						<% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %>
+						<% end %>
+						<% end %>
+						<tr style="border-top:4px double #666;font-weight:600;">
+							<td colspan="2" style="text-align:center;">Total Void Amount :</td>
+							<td><%= total_amount rescue '-' %></td>
+							<td><%= grand_total rescue '-' %></td>
+							<td><%= rounding_adjustment  rescue '-'%></td>
+							<td colspan="3"><%= grand_rounding_adjustment  rescue '-'%></td>
+						</tr>
+					</tbody>
+				</table>
+				<% end %>
+			</div>
+		</div>
 
 <script>
-	$(function(){
-
+    $(function(){
 		var check_arr = [];
-
 		$('#sel_period').change(function(){
-			
 			search_by_period();
-			
 		});
-		
+
 		function search_by_period(){
 			var period = $('#sel_period').val();
 			var period_type = 0;
@@ -102,15 +100,15 @@
 
 			show_shift_name(period,period_type,from,to,'shift_item');	
 		}   
-		
+
 		$('#from').change(function(){
 			search_by_date();	   
 		});
-		
+
 		$('#to').change(function(){
 			search_by_date();
 		});   
-		
+
 		function search_by_date(){
 			var from = $('#from').val();
 			var to = $('#to').val();
@@ -121,7 +119,7 @@
 				shift_name = from + ',' + to;
 
 				check_arr.push(to);
-				
+
 				console.log(check_arr.length)
 				if(check_arr.length == 1){
 					show_shift_name(period,period_type,from,to,'shift_item');	   	
@@ -130,25 +128,25 @@
 					check_arr = [];
 				}
 			}
-			
+
 		}
-		
+
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+
 			shift.empty();
-			
+
 			var str = '';
 			var param_shift = '';	   
 			var param_shift = '<%= params[:shift_name] rescue '-'%>';
 
 			url = '<%= reports_get_shift_by_date_path %>';
-			
+
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 
 				str = '<option value="0">--- All Shift ---</option>';
 				$(data.message).each(function(index){	
-					
+
 					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
 					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
 					var shift_id = data.message[index].shift_id ;
@@ -163,7 +161,7 @@
 						selected = '';			   
 					}		   			   
 					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
-					
+
 			   // console.log(sh_date)
 			}) 
 				shift.append(str);
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 3b43f5ea..357ab350 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -37,6 +37,10 @@ Rails.application.config.assets.precompile += %w( fileinput.min.js )
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
 
+# --- Custom SX Themem ----
+Rails.application.config.assets.precompile += %w( sx-sidebar.css )
+Rails.application.config.assets.precompile += %w( popper.min.js )
+
 # --- Inventory Definition ----
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 

From f4a6ff384761c776f9bae29620e94695afa1071f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 26 Sep 2017 18:06:43 +0630
Subject: [PATCH 04/18] update ui design

---
 app/assets/stylesheets/sx-sidebar.css | 111 +++++++++++++++++++-------
 app/views/layouts/OQS.html.erb        |   2 +-
 app/views/layouts/_header.html.erb    |  35 +++++++-
 app/views/layouts/_sidebar.html.erb   | 109 +++++++------------------
 4 files changed, 145 insertions(+), 112 deletions(-)

diff --git a/app/assets/stylesheets/sx-sidebar.css b/app/assets/stylesheets/sx-sidebar.css
index 933b5e32..6f8d5f04 100644
--- a/app/assets/stylesheets/sx-sidebar.css
+++ b/app/assets/stylesheets/sx-sidebar.css
@@ -3,7 +3,8 @@
  * Copyright 2013-2017 Start Bootstrap
  * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/blob/master/LICENSE)
  */
-
+ 
+/**/
 #wrapper {
     padding-left: 0;
     -webkit-transition: all 0.5s ease;
@@ -20,14 +21,13 @@
    /* z-index: 1000;*/
     /*position: fixed;*/
      z-index: 1;
-    position: absolute;
+    position: ;
     left: 200px;
     width: 0;
     height: 100%;
-    margin-left: -200px;
+    margin-left: -224px;
     margin-top:-20px;
-    overflow-x: auto;
-    background: #222d32;
+    overflow-x: ;
     -webkit-transition: all 0.5s ease;
     -moz-transition: all 0.5s ease;
     -o-transition: all 0.5s ease;
@@ -55,6 +55,7 @@
 
 .sidebar-nav {
     position: absolute;
+    background: #222d32;
     top: 0;
     width: 200px;
     margin: 0;
@@ -133,40 +134,90 @@
         margin-right: 0;
     }
 }
-
-.dropdown-item{
-    padding: 0px 1.5rem !important;
-}
-
-.sidebar-sub-menu {
-    position: relative !important;
+.accordion {
     width: 200px;
     list-style: none;
     font-size: 14px;
-    background-color: #161926;
+    color: #999999 ;
     padding: 0px !important;
     margin: 0px !important;
 }
 
-.sidebar-sub-item {
-    display: block;
-    width: 100%;
-    
-    /*clear: both;*/
-    /*font-weight: normal;*/
-    /*color: #292b2c;
-    text-align: inherit;
-    white-space: nowrap;
-    background: none;
-    border: 0;*/
+.accordion .link {
+  cursor: pointer;
+  display: block;
+ /* padding: 15px 15px 15px 42px;
+  color: #4D4D4D;*/
+ /* font-size: 14px;
+  font-weight: 700;*/
+  /*border-bottom: 1px solid #CCC;*/
+  position: relative;
+  -webkit-transition: all 0.4s ease;
+  -o-transition: all 0.4s ease;
+  transition: all 0.4s ease;
 }
-.fa{
-   
+
+/*.accordion li:last-child .link { border-bottom: 0; }*/
+
+.accordion li i {
+  position: absolute;
+  top: 13px;
+  left: 12px;
+  font-size: 16px;
+  color: #999999;
+  -webkit-transition: all 0.4s ease;
+  -o-transition: all 0.4s ease;
+  transition: all 0.4s ease;
 }
-.custom-fa-arrow{
-     font-size: 20px !important;
-    font-weight: bold;
-    padding: 9px 20px;
+
+.accordion li i.fa-chevron-down {
+  right: 12px;
+  left: auto;
+  font-size: 16px;
+}
+.accordion li .link:hover {
+  background: rgba(255, 255, 255, 0.2);
+  color: #FFF;
+}
+.accordion li.open .link { color: #fff; }
+
+.accordion li.open .link > .submenu { display: block;overflow: hidden;}
+
+.accordion li.open i { color: #fff; }
+
+.accordion li.open i.fa-chevron-down {
+  -webkit-transform: rotateX(180deg);
+  -ms-transform: rotateX(180deg);
+  -o-transform: rotateX(180deg);
+  transform: rotateX(180deg);
+}
+
+.submenu {
+  display: none;
+  list-style: none;
+  margin-left: ;
+  background: #161926;
+  font-size: 14px;
+}
+
+.submenu li { 
+    margin-left: -38px;
+ }
+
+.submenu a {
+  display: block;
+  text-decoration: none;
+  color: #d9d9d9;
+  padding-left:20px;
+  -webkit-transition: all 0.25s ease;
+  -o-transition: all 0.25s ease;
+  transition: all 0.25s ease;
+}
+
+.submenu a:hover {
+  background: #b63b4d;
+  color: #FFF;
 }
 
 
+
diff --git a/app/views/layouts/OQS.html.erb b/app/views/layouts/OQS.html.erb
index 102edba2..3a149b19 100644
--- a/app/views/layouts/OQS.html.erb
+++ b/app/views/layouts/OQS.html.erb
@@ -14,7 +14,7 @@
   </head>
 
   <body>
-    <%= render 'layouts/header_oqs' %>
+    <%= render 'layouts/header' %>
     <div class="container-fluid">
       <% flash.each do |type, message| %>
 						  <div class="alert fade in">
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ea3ffc5e..9afcb585 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,7 +8,7 @@
    <a class="navbar-brand" href="<%= dashboard_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
 
    <div class="collapse navbar-collapse" id="navbarCollapse">
-      <!-- <ul class="navbar-nav mr-auto">
+      <ul class="navbar-nav mr-auto">
         <li class="navbar-nav mr-auto dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Settings</a>
           <ul class="dropdown-menu">
@@ -74,7 +74,7 @@
         </li>
 
 
-     </ul>  -->
+     </ul>  
        
    </div>
    <% if current_login_employee %>
@@ -99,9 +99,38 @@
         }
 </style>
 <!-- Menu Toggle Script -->
+
 <script>
   $("#sx-menu-toggle").click(function(e) {
     e.preventDefault();
     $("#wrapper").toggleClass("toggled");
   });
-</script>
\ No newline at end of file
+
+  $(function() {
+  var Accordion = function(el, multiple) {
+    this.el = el || {};
+    this.multiple = multiple || false;
+
+    // Variables privadas
+    var links = this.el.find('.link');
+    // Evento
+    links.on('click', {el: this.el, multiple: this.multiple}, this.dropdown)
+  }
+
+  Accordion.prototype.dropdown = function(e) {
+    var $el = e.data.el;
+      $this = $(this),
+      $next = $this.next();
+
+    $next.slideToggle();
+    $this.parent().toggleClass('open');
+
+    if (!e.data.multiple) {
+      $el.find('.submenu').not($next).slideUp().parent().removeClass('open');
+    };
+  } 
+
+  var accordion = new Accordion($('#accordion'), false);
+});
+
+</script>
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
index a34061b4..49571e18 100644
--- a/app/views/layouts/_sidebar.html.erb
+++ b/app/views/layouts/_sidebar.html.erb
@@ -1,85 +1,38 @@
 <div id="sidebar-wrapper">
-  <ul class="sidebar-nav">
+  <ul id="accordion" class="accordion sidebar-nav">
     <li class="header"><a>Main Navigation</a></li>
-    <li>
-       <%= link_to "Dashboard ", dashboard_path,:class =>"" %>
-     </li>
-    <li>
-       <%= link_to "OQS ", oqs_root_path,:class =>"" %>
-    </li>
-    <li>
-      <%= link_to "Cashier ", origami_root_path,:class =>"" %>
-    </li>
-    <li>
-      <%= link_to "CRM ", crm_customers_path,:class =>"" %>
-    </li>
-    <li>
-      <%= link_to "Inventory ", transactions_sales_path,:class =>"" %>
-    </li>
-
+    <li><%= link_to "Dashboard ", dashboard_path,:class =>"" %> </li>
+    <li><%= link_to "OQS ", oqs_root_path,:class =>"" %></li>
+    <li><%= link_to "Cashier ", origami_root_path,:class =>"" %></li>
+    <li><%= link_to "CRM ", crm_customers_path,:class =>"" %></li>
+    <li><%= link_to "Inventory ", inventory_path,:class =>"" %></li>
     <li class="header"><a>Settings</a></li>
-
+    <li><%= link_to "Zones ", settings_zones_path,:class =>"" %></li>
+    <li><%= link_to "Order Queue Station ", settings_order_queue_stations_path,:class =>"" %></li>
+    <li><%= link_to "Menu ", settings_menus_path,:class =>"" %></li>
     <li>
-      <%= link_to "Zones ", transactions_sales_path,:class =>"" %>
+      <div class="link">Transactions<i class="fa fa-chevron-down"></i>
+      </div>
+      <ul class="submenu">
+        <li> <%= link_to "Orders ", transactions_orders_path,:class =>"" %></li>
+        <li> <%= link_to "Sales ", transactions_sales_path,:class =>"" %></li>
+        <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
+      </ul>
     </li>
     <li>
-      <%= link_to "Order Queue Station ", transactions_sales_path,:class =>"" %>
+      <div class="link">Blalalal<i class="fa fa-chevron-down"></i>
+      </div>
+      <ul class="submenu">
+        <li> <%= link_to "Orders ", transactions_orders_path,:class =>"" %></li>
+        <li> <%= link_to "Sales ", transactions_sales_path,:class =>"" %></li>
+        <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
+      </ul>
     </li>
-    <li>
-      <%= link_to "Menu ", settings_menus_path,:class =>"" %>
-    </li>
-
-    <li>
-      <%= link_to "Cashier Terminal ", transactions_sales_path,:class =>"" %>
-    </li>
-
-    <li>
-      <%= link_to "Print Settings ", transactions_sales_path,:class =>"" %>
-    </li>
-    <li>
-      <%= link_to "Staff ", settings_menus_path,:class =>"" %>
-    </li>
-
-    <li>
-      <%= link_to "Product ", transactions_sales_path,:class =>"" %>
-    </li>
-
-    <li>
-      <%= link_to "Promotion ", transactions_sales_path,:class =>"" %>
-    </li>
-    <li>
-      <div class="dropdown">
-        <a class="custom-dropdown" href="#" id="dropdownMenuButton"  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Transaction <i class="fa fa-angle-left pull-right custom-fa-arrow"></i>
-        </a> 
-        <div class="dropdown-menu sidebar-sub-menu" aria-labelledby="dropdownMenuButton">
-         <%= link_to "Orders ", transactions_orders_path,:class =>"dropdown-item sidebar-sub-item" %>
-         <%= link_to "Sales ", transactions_sales_path,:class =>"dropdown-item sidebar-sub-item" %>
-         <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"dropdown-item  sidebar-sub-item" %>
-       </div>
-     </div>
-    </li>
-    <!-- <li>
-              <div class="dropdown">
-                <a class="custom-dropdown" href="#" id="dropdownMenuButton"  data-toggle="dropdown" aria-haspopup="true" ariaroot_path-expanded="false">
-                Transaction <i class="fa fa-angle-left pull-right custom-fa-arrow"></i>
-              </a> 
-              <div class="dropdown-menu sidebar-sub-menu" aria-labelledby="dropdownMenuButton">
-                 <%= link_to "Daily Sale Report", reports_dailysale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-                <%= link_to "Sales Item Report", reports_saleitem_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-                <%= link_to "Receipt Report", reports_receipt_no_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-                <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-                <%= link_to "Credit Sale Report", reports_credit_payment_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-                <%= link_to "Void Sale Report", reports_void_sale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-                <%= link_to "Commission Report", reports_commission_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-                <%= link_to "Stock Check Report", reports_stock_check_index_path, :class =>"dropdown-item sidebar-sub-item" %>
-              </div>
-              </div>
-         </li> -->
-            
-      <li>
-           <%= link_to "Reports", reports_dailysale_index_path, :class =>"" %>
-      </li>
-     </ul>
-
-</div>
\ No newline at end of file
+    <li><%= link_to "Cashier Terminal ", settings_cashier_terminals_path,:class =>"" %></li>
+    <li><%= link_to "Print Settings ", print_settings_path,:class =>"" %></li>
+    <li><%= link_to "Staff ", settings_employees_path,:class =>"" %></li>
+    <li><%= link_to "Product ", settings_products_path,:class =>"" %></li>
+    <li><%= link_to "Promotion ", settings_promotions_path,:class =>"" %></li>
+    <li><%= link_to "Reports", reports_dailysale_index_path, :class =>"" %></li>
+  </ul>
+</div>

From dbd57e646749145147257cbd002fcd41d87658a2 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 27 Sep 2017 09:41:30 +0630
Subject: [PATCH 05/18] update header

---
 app/views/layouts/_header.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 9afcb585..be10da70 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,7 +8,7 @@
    <a class="navbar-brand" href="<%= dashboard_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
 
    <div class="collapse navbar-collapse" id="navbarCollapse">
-      <ul class="navbar-nav mr-auto">
+      <!-- <ul class="navbar-nav mr-auto">
         <li class="navbar-nav mr-auto dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Settings</a>
           <ul class="dropdown-menu">
@@ -74,7 +74,7 @@
         </li>
 
 
-     </ul>  
+     </ul> -->  
        
    </div>
    <% if current_login_employee %>

From 96af0fcd177bd5f6d9ddb599ea1037dfad840ee7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Sep 2017 14:18:04 +0630
Subject: [PATCH 06/18] update ui for oqs and crm

---
 app/controllers/crm/bookings_controller.rb    |  2 +-
 app/controllers/crm/customers_controller.rb   |  2 +-
 .../crm/dining_queues_controller.rb           |  2 +-
 app/controllers/crm/home_controller.rb        |  2 +-
 app/controllers/oqs/edit_controller.rb        |  2 +-
 app/controllers/oqs/home_controller.rb        |  2 +-
 app/views/crm/customers/index.html.erb        |  6 ++---
 app/views/layouts/_sidebar.html.erb           | 18 ++++++-------
 app/views/layouts/application.html.erb        | 25 ++++++++++++++++---
 9 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb
index efaa5419..d712f66f 100644
--- a/app/controllers/crm/bookings_controller.rb
+++ b/app/controllers/crm/bookings_controller.rb
@@ -1,4 +1,4 @@
-class Crm::BookingsController < BaseCrmController
+class Crm::BookingsController < ApplicationController
 	load_and_authorize_resource
 	def update_booking
         booking = Booking.find(params[:booking_id])
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 2a0626dd..0573b67f 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -1,4 +1,4 @@
-class Crm::CustomersController < BaseCrmController
+class Crm::CustomersController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_crm_customer, only: [:show, :edit, :update, :destroy]
 
diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb
index a48e03a7..6c093ace 100644
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -1,4 +1,4 @@
-class Crm::DiningQueuesController < BaseCrmController
+class Crm::DiningQueuesController < ApplicationController
   load_and_authorize_resource
   before_action :set_dining_queue, only: [:show, :edit, :update, :destroy]
 
diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb
index 012f2bc6..92b31261 100644
--- a/app/controllers/crm/home_controller.rb
+++ b/app/controllers/crm/home_controller.rb
@@ -1,4 +1,4 @@
-class Crm::HomeController < BaseCrmController
+class Crm::HomeController < ApplicationController
   def index
   	 
   	   @booking  = Booking.all
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 3c087aa9..85733e8b 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -1,4 +1,4 @@
-class Oqs::EditController < BaseOqsController
+class Oqs::EditController < ApplicationController#BaseOqsController
   def index
   	assigned_item_id = params[:id]
     assigned_item = AssignedOrderItem.find(assigned_item_id)
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index af843c7e..561b0552 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -1,4 +1,4 @@
-class Oqs::HomeController < BaseOqsController
+class Oqs::HomeController < ApplicationController#BaseOqsController
   def index
 
   	@queue_stations = OrderQueueStation.all
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index ca5404ec..757a3681 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -21,10 +21,10 @@
             <thead>
 
               <tr>
-                 <td colspan="6">
+                 <td colspan="7">
                     <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
                       <div class="input-append col-md-7 form-group pull-left">
-                        <input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control input-xs col-md-9">
+                        <input type="text" name="filter" style="margin-right:5px" placeholder="Search" id="search" class="form-control input-xs col-md-9">
                         <input type="hidden" name="type" id="type" value="">
                         <button type="submit" class="btn btn-primary btn-md">Search</button>
                         <!-- <a href="modal-window" data-toggle= "modal" data-target="#modal-window" class="btn btn-primary btn-md" id="card_read" >Read Card</a> -->
@@ -87,7 +87,7 @@
     <div class="col-lg-1 col-md-1 col-sm-1">
     <br>
        <a href="<%= dashboard_path%>" class="btn btn-primary">
-        <i class="fa fa-arrow-left fa-lg"></i> Back
+       Back
        </a>
     </div>
 </div>
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
index 49571e18..571e7632 100644
--- a/app/views/layouts/_sidebar.html.erb
+++ b/app/views/layouts/_sidebar.html.erb
@@ -4,7 +4,14 @@
     <li><%= link_to "Dashboard ", dashboard_path,:class =>"" %> </li>
     <li><%= link_to "OQS ", oqs_root_path,:class =>"" %></li>
     <li><%= link_to "Cashier ", origami_root_path,:class =>"" %></li>
-    <li><%= link_to "CRM ", crm_customers_path,:class =>"" %></li>
+    <li>
+      <div class="link">CRM<i class="fa fa-chevron-down"></i>
+      </div>
+      <ul class="submenu">
+        <li> <%= link_to "Customer ", crm_customers_path,:class =>"" %></li>
+        <li> <%= link_to "Queue ", crm_dining_queues_path,:class =>"" %></li>
+      </ul>
+    </li>
     <li><%= link_to "Inventory ", inventory_path,:class =>"" %></li>
     <li class="header"><a>Settings</a></li>
     <li><%= link_to "Zones ", settings_zones_path,:class =>"" %></li>
@@ -19,15 +26,6 @@
         <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
       </ul>
     </li>
-    <li>
-      <div class="link">Blalalal<i class="fa fa-chevron-down"></i>
-      </div>
-      <ul class="submenu">
-        <li> <%= link_to "Orders ", transactions_orders_path,:class =>"" %></li>
-        <li> <%= link_to "Sales ", transactions_sales_path,:class =>"" %></li>
-        <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
-      </ul>
-    </li>
     <li><%= link_to "Cashier Terminal ", settings_cashier_terminals_path,:class =>"" %></li>
     <li><%= link_to "Print Settings ", print_settings_path,:class =>"" %></li>
     <li><%= link_to "Staff ", settings_employees_path,:class =>"" %></li>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2cc480a2..dac05832 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,12 +11,28 @@
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
+
+    <!-- oqs -->
+    <%= stylesheet_link_tag    'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <!-- crm -->
+    <%= stylesheet_link_tag    'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>    
+
     <%= stylesheet_link_tag    'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'sx-sidebar', media: 'all', 'data-turbolinks-track': 'reload' %>
-    
+  <!-- JS -->  
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
+    <!-- oqs -->
+    <%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %>
+    <!-- crm -->
+    <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>
+
     <%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %>      
-    <%= javascript_include_tag 'popper.min', 'data-turbolinks-track': 'reload' %> 
+    
+
+
+    
   </head>
 
   <body>
@@ -32,10 +48,11 @@
             alert = "alert-danger"
           end
         %>
+            <% if !flash["errors"]%>
 						  <div class="alert <%=alert%> fade-in">
-						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
-						    <%= message %>
+						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>			<%=message%>
 						  </div>
+            <% end %>
 			<% end %>
       <div id="wrapper">
         <!-- Sidebar -->

From 444b270dd10a1d07a2fa7d59dd300898f6641a7a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Sep 2017 13:42:41 +0630
Subject: [PATCH 07/18] update ui design

---
 app/assets/stylesheets/application.scss       |  1 +
 app/assets/stylesheets/sx-sidebar.css         |  6 ++-
 .../inventory/inventory_controller.rb         |  2 +-
 .../inventory_definitions_controller.rb       |  2 +-
 .../inventory/stock_check_items_controller.rb |  2 +-
 .../inventory/stock_checks_controller.rb      |  2 +-
 .../origami/card_payments_controller.rb       |  2 +-
 .../origami/cash_ins_controller.rb            |  2 +-
 .../origami/cash_outs_controller.rb           |  2 +-
 .../origami/credit_payments_controller.rb     |  2 +-
 .../origami/customers_controller.rb           |  2 +-
 .../origami/discounts_controller.rb           |  2 +-
 app/controllers/origami/home_controller.rb    |  2 +-
 app/controllers/origami/home_controller_bk.rb |  2 +-
 .../origami/in_duties_controller.rb           |  2 +-
 app/controllers/origami/jcb_controller.rb     |  2 +-
 app/controllers/origami/master_controller.rb  |  2 +-
 .../origami/moveroom_controller.rb            |  2 +-
 .../origami/movetable_controller.rb           |  2 +-
 app/controllers/origami/mpu_controller.rb     |  2 +-
 app/controllers/origami/orders_controller.rb  |  2 +-
 .../origami/other_charges_controller.rb       |  2 +-
 .../origami/others_payments_controller.rb     |  2 +-
 .../origami/payments_controller.rb            |  2 +-
 .../origami/paypar_payments_controller.rb     |  2 +-
 .../origami/product_commissions_controller.rb |  2 +-
 .../origami/redeem_payments_controller.rb     |  2 +-
 .../origami/request_bills_controller.rb       |  2 +-
 .../origami/room_invoices_controller.rb       |  2 +-
 app/controllers/origami/rooms_controller.rb   |  2 +-
 .../origami/sale_edit_controller.rb           |  2 +-
 app/controllers/origami/sales_controller.rb   |  2 +-
 app/controllers/origami/shifts_controller.rb  |  2 +-
 .../origami/table_invoices_controller.rb      |  2 +-
 app/controllers/origami/visa_controller.rb    |  2 +-
 app/controllers/origami/void_controller.rb    |  2 +-
 app/controllers/origami/voucher_controller.rb |  2 +-
 app/views/layouts/application.html.erb        | 52 ++++++++++---------
 38 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4aabe81b..4bad284a 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -16,6 +16,7 @@
 
 .setting_nav{
 	background-color: #2f5663;
+  height: 53px;
 }
 
 ul.navbar-nav li a{
diff --git a/app/assets/stylesheets/sx-sidebar.css b/app/assets/stylesheets/sx-sidebar.css
index 6f8d5f04..e181db8a 100644
--- a/app/assets/stylesheets/sx-sidebar.css
+++ b/app/assets/stylesheets/sx-sidebar.css
@@ -41,13 +41,14 @@
 #page-content-wrapper {
     width: 100%;
     position: absolute;
-    padding: 0px;
+    padding-top: 20px;
     
 }
 
 #wrapper.toggled #page-content-wrapper {
     position: absolute;
     margin-right: -200px;
+    padding-top: 20px;
 }
 
 
@@ -126,12 +127,13 @@
         width: 216px;
     }
     #page-content-wrapper {
-        padding: 0px;
+        padding-top: 20px;
         position: relative;
     }
     #wrapper.toggled #page-content-wrapper {
         position: relative;
         margin-right: 0;
+        padding-top: 20px;
     }
 }
 .accordion {
diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 673cf943..3bf3c84c 100644
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::InventoryController < BaseInventoryController
+class Inventory::InventoryController < ApplicationController#BaseInventoryController
 
    def index
      @products = InventoryDefinition.all.active.order('created_at desc') 
diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index 33b7dd75..cc9eecd8 100644
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::InventoryDefinitionsController < BaseInventoryController
+class Inventory::InventoryDefinitionsController < ApplicationController#BaseInventoryController
   before_action :set_inventory_definition, only: [:show, :edit, :update, :destroy]
 
   # GET /inventory_definitions
diff --git a/app/controllers/inventory/stock_check_items_controller.rb b/app/controllers/inventory/stock_check_items_controller.rb
index 18980f29..43782767 100644
--- a/app/controllers/inventory/stock_check_items_controller.rb
+++ b/app/controllers/inventory/stock_check_items_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::StockCheckItemsController < BaseInventoryController
+class Inventory::StockCheckItemsController < ApplicationController#BaseInventoryController
   before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy]
 
   # GET /stock_check_items
diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index 52d183de..f7a9e7fe 100644
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::StockChecksController < BaseInventoryController
+class Inventory::StockChecksController < ApplicationController#BaseInventoryController
   def index
     @check = StockCheck.new
     @inventory_definitions = InventoryDefinition.active.all
diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb
index 1d18e401..77eb4e4f 100644
--- a/app/controllers/origami/card_payments_controller.rb
+++ b/app/controllers/origami/card_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CardPaymentsController < BaseOrigamiController
+class Origami::CardPaymentsController < ApplicationController
 
 
   def index
diff --git a/app/controllers/origami/cash_ins_controller.rb b/app/controllers/origami/cash_ins_controller.rb
index 085f68b8..41c5bd8d 100644
--- a/app/controllers/origami/cash_ins_controller.rb
+++ b/app/controllers/origami/cash_ins_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CashInsController < BaseOrigamiController
+class Origami::CashInsController < ApplicationController
 
   def new
   end
diff --git a/app/controllers/origami/cash_outs_controller.rb b/app/controllers/origami/cash_outs_controller.rb
index 95ab97a2..a300db75 100644
--- a/app/controllers/origami/cash_outs_controller.rb
+++ b/app/controllers/origami/cash_outs_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CashOutsController < BaseOrigamiController
+class Origami::CashOutsController < ApplicationController
 
   def new
   end
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index ff9ae413..3f0b89aa 100644
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CreditPaymentsController < BaseOrigamiController
+class Origami::CreditPaymentsController < ApplicationController
 
 
   def index
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 72597613..e74dd15d 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CustomersController < BaseOrigamiController
+class Origami::CustomersController < ApplicationController
   load_and_authorize_resource
   def index
   end
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 8fddfa0f..99f55f2f 100644
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -1,4 +1,4 @@
-class Origami::DiscountsController < BaseOrigamiController
+class Origami::DiscountsController < ApplicationController
   authorize_resource :class => false
 
   #discount page show from origami index with selected order
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 27b9cc52..8a58501d 100644
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -1,4 +1,4 @@
-class Origami::HomeController < BaseOrigamiController
+class Origami::HomeController < ApplicationController
  before_action :set_dining, only: [:show]
 
   def index
diff --git a/app/controllers/origami/home_controller_bk.rb b/app/controllers/origami/home_controller_bk.rb
index 5496cca5..4839f15c 100644
--- a/app/controllers/origami/home_controller_bk.rb
+++ b/app/controllers/origami/home_controller_bk.rb
@@ -1,4 +1,4 @@
-class Origami::HomeController < BaseOrigamiController
+class Origami::HomeController < ApplicationController
   def index
     if params[:booking_id] != nil
       type=params[:booking_id].split('-')[0];
diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb
index eaf23c5a..1f7df320 100644
--- a/app/controllers/origami/in_duties_controller.rb
+++ b/app/controllers/origami/in_duties_controller.rb
@@ -1,4 +1,4 @@
-class Origami::InDutiesController < BaseOrigamiController
+class Origami::InDutiesController < ApplicationController
   before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
 
   # GET /in_duties
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index a8b77861..9643ccc6 100644
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -1,4 +1,4 @@
-class Origami::JcbController < BaseOrigamiController
+class Origami::JcbController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index ba97cad9..a7e680d3 100644
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MasterController < BaseOrigamiController
+class Origami::MasterController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb
index ef1c286a..782145d7 100644
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MoveroomController < BaseOrigamiController
+class Origami::MoveroomController < ApplicationController
   
   authorize_resource :class => false
   
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 6062216f..fa9a5ed4 100644
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MovetableController < BaseOrigamiController
+class Origami::MovetableController < ApplicationController
   
   authorize_resource :class => false
 
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index c9f707e3..85720e5e 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MpuController < BaseOrigamiController
+class Origami::MpuController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 800c460b..d23b4787 100644
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -1,4 +1,4 @@
-class Origami::OrdersController < BaseOrigamiController
+class Origami::OrdersController < ApplicationController
 
   def show
     @tables = Table.all.active.order('status desc')
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index b0e6472c..c21e5011 100644
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -1,4 +1,4 @@
-class Origami::OtherChargesController < BaseOrigamiController
+class Origami::OtherChargesController < ApplicationController
 	authorize_resource :class => false
 
 	def index
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index 2a24e2ac..001033e5 100644
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::OthersPaymentsController < BaseOrigamiController
+class Origami::OthersPaymentsController < ApplicationController
 
 
   def index
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 2a9fe5d9..2dd1a412 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::PaymentsController < BaseOrigamiController
+class Origami::PaymentsController < ApplicationController
 
   authorize_resource :class => false
   def index
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 0c3ea11f..491c989c 100644
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::PayparPaymentsController < BaseOrigamiController
+class Origami::PayparPaymentsController < ApplicationController
 	def create
 		sale_id = params[:sale_id]
 		redeem_amount = params[:redeem_amount]
diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index 74dd8095..ada68f59 100644
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -1,4 +1,4 @@
-class Origami::ProductCommissionsController < BaseOrigamiController
+class Origami::ProductCommissionsController < ApplicationController
   before_action :set_product_commission, only: [:show, :edit, :update, :destroy]
 
   # GET /product_commissions
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 802ba51b..c53e5d5a 100644
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RedeemPaymentsController < BaseOrigamiController
+class Origami::RedeemPaymentsController < ApplicationController
  	def index
  		@sale_id = params[:sale_id]
  		payment_method = params[:payment_method]
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 7fa51da4..378e04c1 100644
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RequestBillsController < BaseOrigamiController
+class Origami::RequestBillsController < ApplicationController
 
   # Print Request Bill and add to sale tables
   def print
diff --git a/app/controllers/origami/room_invoices_controller.rb b/app/controllers/origami/room_invoices_controller.rb
index 8d805771..8fb995fc 100644
--- a/app/controllers/origami/room_invoices_controller.rb
+++ b/app/controllers/origami/room_invoices_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RoomInvoicesController < BaseOrigamiController
+class Origami::RoomInvoicesController < ApplicationController
  	def index
     @room = DiningFacility.find(params[:room_id])
     puts "room bookig lenght"
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 0eed53bc..67daf9af 100644
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RoomsController < BaseOrigamiController
+class Origami::RoomsController < ApplicationController
 
   def index
     @tables = Table.all.active.order('status desc')
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 61c8b00f..6a183493 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -1,4 +1,4 @@
-class Origami::SaleEditController < BaseOrigamiController
+class Origami::SaleEditController < ApplicationController
   authorize_resource class: false
   # Index for sale item void OR edit
   def edit
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 56e41a2a..7ab44c08 100644
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -1,4 +1,4 @@
-class Origami::SalesController < BaseOrigamiController
+class Origami::SalesController < ApplicationController
 
   def show
     @tables = Table.all.active.order('status desc')
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 31c68edf..c70a38c9 100644
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -1,4 +1,4 @@
-class Origami::ShiftsController < BaseOrigamiController
+class Origami::ShiftsController < ApplicationController
 
   def index
   end
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index 4571ba87..6947548e 100644
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -1,4 +1,4 @@
-class Origami::TableInvoicesController < BaseOrigamiController
+class Origami::TableInvoicesController < ApplicationController
  	def index
     @table = DiningFacility.find(params[:table_id])
     puts "table bookig lenght"
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 552d960b..4866fb13 100644
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -1,4 +1,4 @@
-class Origami::VisaController < BaseOrigamiController
+class Origami::VisaController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 1cf1ec65..15215279 100644
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -1,4 +1,4 @@
-class Origami::VoidController < BaseOrigamiController
+class Origami::VoidController < ApplicationController
    authorize_resource :class => false
   def overall_void
 
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index e65abc85..d96d5a0d 100644
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -1,4 +1,4 @@
-class Origami::VoucherController < BaseOrigamiController
+class Origami::VoucherController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index dac05832..dc73ab8c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,16 +9,20 @@
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
+    
 
     <!-- oqs -->
     <%= stylesheet_link_tag    'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
     <!-- crm -->
-    <%= stylesheet_link_tag    'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>    
+    <%= stylesheet_link_tag    'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>   
+    <!-- oqs -->
+    <%= stylesheet_link_tag    'origami', media: 'all', 'data-turbolinks-track': 'reload' %> 
 
     <%= stylesheet_link_tag    'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'sx-sidebar', media: 'all', 'data-turbolinks-track': 'reload' %>
+
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
   <!-- JS -->  
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
     <!-- oqs -->
@@ -30,36 +34,34 @@
 
     <%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %>      
     
-
-
-    
   </head>
 
   <body>
     <%= render 'layouts/header' %>
     <div class="container-fluid">
-      <% flash.each do |type, message| %>
-        <%
-          if type== "warning"
-            alert = "alert-warning"
-          elsif type== "notice"
-            alert = "alert-success" 
-          else
-            alert = "alert-danger"
-          end
-        %>
-            <% if !flash["errors"]%>
-						  <div class="alert <%=alert%> fade-in">
-						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>			<%=message%>
-						  </div>
-            <% end %>
-			<% end %>
+      
       <div id="wrapper">
         <!-- Sidebar -->
-         <%=render 'layouts/sidebar' %>
+        <%=render 'layouts/sidebar' %>
         <!-- /#sidebar-wrapper -->
-         <div id="page-content-wrapper">
-           <%= yield %>  
+        <div id="page-content-wrapper">
+          <% flash.each do |type, message| %>
+              <%
+                if type== "warning"
+                  alert = "alert-warning"
+                elsif type== "notice"
+                  alert = "alert-success" 
+                else
+                  alert = "alert-danger"
+                end
+              %>
+                  <% if !flash["errors"]%>
+                    <div class="alert <%=alert%> fade-in">
+                      <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>      <%=message%>
+                    </div>
+                  <% end %>
+          <% end %>
+          <%= yield %>  
           </div>   
       </div>
        

From 1916d335330060ca92ac505a4ace0a29591dc13c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 9 Oct 2017 14:46:58 +0630
Subject: [PATCH 08/18] provision setup

---
 app/assets/stylesheets/application.scss |  5 +++
 config/initializers/mysql2_adapter.rb   | 45 +++++++++++++++++++++++++
 config/initializers/secrets.rb          |  6 ++++
 config/initializers/sx.rb               |  4 +++
 config/secrets.yml                      |  2 ++
 config/sx.yml                           | 13 +++++++
 6 files changed, 75 insertions(+)
 create mode 100755 config/initializers/mysql2_adapter.rb
 create mode 100755 config/initializers/secrets.rb
 create mode 100644 config/initializers/sx.rb
 create mode 100644 config/sx.yml

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4bad284a..6e7fee04 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -14,6 +14,11 @@
 //   padding-top: 4.5rem;
 // }
 
+#sx-menu-toggle {
+  background-color: transparent;
+  border: 1px solid transparent;
+}
+
 .setting_nav{
 	background-color: #2f5663;
   height: 53px;
diff --git a/config/initializers/mysql2_adapter.rb b/config/initializers/mysql2_adapter.rb
new file mode 100755
index 00000000..09424ddf
--- /dev/null
+++ b/config/initializers/mysql2_adapter.rb
@@ -0,0 +1,45 @@
+module ActiveRecord
+  class Base
+    # Overriding ActiveRecord::Base.mysql2_connection
+    # method to allow passing options from database.yml
+    #
+    # Example of database.yml
+    #
+    #   login: &login
+    #     socket: /tmp/mysql.sock
+    #     adapter: mysql2
+    #     host: localhost
+    #     encoding: utf8
+    #     flags: 131072
+    #
+    # @param [Hash] config hash that you define in your
+    #   database.yml
+    # @return [Mysql2Adapter] new MySQL adapter object
+    #
+    def self.mysql2_connection(config)
+      config[:username] = 'root' if config[:username].nil?
+
+      if Mysql2::Client.const_defined? :FOUND_ROWS
+        config[:flags] = config[:flags] ? config[:flags] | Mysql2::Client::FOUND_ROWS : Mysql2::Client::FOUND_ROWS
+      end
+
+      client = Mysql2::Client.new(config.symbolize_keys)
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
+    end
+  end
+
+  # This method is for running stored procedures.
+  #
+  # @return [Hash]
+  #
+  def self.select_sp(sql, name = nil)
+    connection = ActiveRecord::Base.connection
+    begin
+      connection.select_all(sql, name)
+    rescue NoMethodError
+    ensure
+      connection.reconnect! unless connection.active?
+    end
+  end
+end
diff --git a/config/initializers/secrets.rb b/config/initializers/secrets.rb
new file mode 100755
index 00000000..6ad1f1eb
--- /dev/null
+++ b/config/initializers/secrets.rb
@@ -0,0 +1,6 @@
+# config = YAML.load_file(Rails.root.join("config/smartsales.yml"))
+# config.fetch(Rails.env, {}).each do |key, value|
+#   ENV[key.upcase] = value.to_s
+# end
+
+SECRETS_CONFIG = YAML.load_file("#{Rails.root}/config/secrets.yml")[Rails.env]
diff --git a/config/initializers/sx.rb b/config/initializers/sx.rb
new file mode 100644
index 00000000..aa52f14c
--- /dev/null
+++ b/config/initializers/sx.rb
@@ -0,0 +1,4 @@
+config = YAML.load_file(Rails.root.join("config/sx.yml"))
+config.fetch(Rails.env, {}).each do |key, value|
+  ENV[key.upcase] = value.to_s
+end
\ No newline at end of file
diff --git a/config/secrets.yml b/config/secrets.yml
index ce7eb8ba..097a13b9 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,6 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
+  provision_key: siPExnkwlHvAXkyQERzAWhNDwpuvnbqsTXoEHaxc
 
 test:
   secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
@@ -20,4 +21,5 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
+  provision_key: siPExnkwlHvAXkyQERzAWhNDwpuvnbqsTXoEHaxc
 
diff --git a/config/sx.yml b/config/sx.yml
new file mode 100644
index 00000000..6bcab70c
--- /dev/null
+++ b/config/sx.yml
@@ -0,0 +1,13 @@
+development:
+ server_mode: cloud #local
+ sx_provision_url: http://192.168.1.75:3002/api
+
+ 
+test:
+ sx_provision_url: secure.smartsales.asia/api
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+ server_mode: cloud 
+ sx_provision_url: secure.smartsales.asia/api

From 49338830d458253805aed59edd483b2419a6859a Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 9 Oct 2017 14:50:34 +0630
Subject: [PATCH 09/18] provision setup

---
 app/controllers/application_controller.rb | 49 ++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 691c6648..6f8eec9a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,18 +3,60 @@ class ApplicationController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
+  # lookup domain for db from  provision
+  before_action :lookup_domain
+
   helper_method :current_company,:current_login_employee,:current_user
    # alias_method :current_user, :current_login_employee,:current_user
   #this is base api base controller to need to inherit.
   #all token authentication must be done here
   #response format must be set to JSON
 
+  def lookup_domain
+    # if request.subdomain.present? && request.subdomain != "www"
+      @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase)
+      if (!@license.nil?)
+        # logger.info "Location - " + @license.name
+        ActiveRecord::Base.establish_connection(website_connection(@license))
+        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
+      else
+        logger.info 'License is nil'
+        # redirect_to root_url(:host => request.domain) + "store_error"
+        render :json => [{ status: false, message: 'Invalid Access!'}]
+      end
+    # end
+  end
+
+  def current_license(url, key)
+    @license = License.new(url, key)
+
+    ##creating md5 hash
+    md5_hostname = Digest::MD5.new
+    md5key = md5_hostname.update(request.host)
+    if (@license.detail_with_local_cache(key, md5key.to_s) == true)
+    #if (@license.detail == true)
+
+      return @license
+    else
+      return nil
+    end
+  end
+
+  def website_connection(license)
+    default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
+    :username => license.dbusername, :password => license.dbpassword)
+
+  end
+
+  # Regular database.yml configuration hash
+  def default_connection
+    @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
+  end
 
   rescue_from CanCan::AccessDenied do |exception|
     flash[:warning] = exception.message
     redirect_to root_path
-  end
-
+  end  
 
   def current_user
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
@@ -42,3 +84,6 @@ class ApplicationController < ActionController::Base
     end
   end
 end
+
+
+

From c70b2dcb1906c5ff9a1eb4f1ee32887b23c7c07c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 9 Oct 2017 15:54:24 +0630
Subject: [PATCH 10/18] provision setup

---
 app/models/license.rb | 192 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)
 create mode 100755 app/models/license.rb

diff --git a/app/models/license.rb b/app/models/license.rb
new file mode 100755
index 00000000..b2682213
--- /dev/null
+++ b/app/models/license.rb
@@ -0,0 +1,192 @@
+class License
+  include HTTParty
+
+  base_uri "secure.smartsales.asia/api"
+
+  attr_accessor :name, :address_1, :address_2, :township, :city, :country, :email, :phone, :fax, :logo, :subdomain,
+  :plan_activation_date, :plan_next_renewal_date, :plan_max_products,:plan_max_customers, :plan_active_connections,
+  :dbhost, :dbschema, :dbusername, :dbpassword, :exchange_unqiue_id, :localqueue_host,:server_mode,:localhost_address,
+  :localqueue_user, :localqueue_password, :remotequeue_host, :remotequeue_user, :remotequeue_password, :api_token, :app_token
+
+  @license = nil
+  @secret = nil
+
+  def initialize(server = "", lookup = "")
+    #this code is hard-code to reflect server mode - Very important.
+    self.server_mode = "cloud"
+
+    if (server != "")
+     self.class.base_uri server
+    end
+
+     @secret = SecureRandom.hex(10)
+     @params = { query: { device: "SXlite", token: SECRETS_CONFIG['provision_key'] } }
+  end
+
+  def shop_code
+    if ( self.subdomain.length > 3)
+      return self.subdomain[0,3].upcase
+    else
+      return self.subdomain.upcase
+    end
+  end
+
+  def detail_with_local_cache(lookup, key)
+    ##Check from local redis - if available load local otherwise get from remote
+    cache_key = "store:license:#{key}:hostname"
+
+    # No Needs for current
+    # @secret = key
+
+    cache_license = nil
+
+    ##Get redis connection from connection pool
+    Redis.current do |conn|
+      cache_license = conn.get(cache_key)
+    end
+
+    Rails.logger.info "Cache key - " + cache_key.to_s
+
+    if cache_license.nil?
+      ##change the d/e key
+      # @options = { query: {device: "SXlite", lookup: lookup, skey: @secret, token: SECRETS_CONFIG['provision_key']} }
+      @params = { query: { device: "SXlite", token: SECRETS_CONFIG['provision_key']} }
+
+      response = self.class.get("/request_license", @params)
+      @license = response.parsed_response
+
+      if (@license["status"] == true)
+
+        assign()
+
+        Rails.logger.info "License - " + response.parsed_response.to_s
+
+        Redis.current do |conn|
+          ##Remote - store the remote response in local redis cache
+          conn.set(cache_key, Marshal.dump(@license))
+          ##ADD to List to remove later
+          conn.sadd("License:cache:keys", cache_key)
+        end
+
+        return true
+      end
+
+      Rails.logger.info 'API License'
+
+    else
+
+      @license = Marshal.load(cache_license) if cache_license
+
+      Rails.logger.info 'Cache License'
+
+      if (@license["status"] == true)
+        assign()
+        return true
+      end
+    end
+    return false
+  end
+
+  def detail
+
+     response = self.class.get("/subdomain", @options)
+     @license = response.parsed_response
+
+     Rails.logger.debug "License - " + response.parsed_response.to_s
+
+
+     if (@license["status"] == true)
+       assign()
+
+       return true
+     end
+
+     return false
+  end
+
+  def check_remote_license(license_key)
+    # @options = { query: {device: "cloud", key: license_key, skey: @secret, token: Rails.application.secrets.provision_key} }
+    @options = { query: {device: "SXlite", key: license_key, skey: @secret, token: SECRETS_CONFIG['provision_key']} }
+    response = self.class.get("/license", @options)
+
+    @license = response.parsed_response
+
+    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+    if (@license["status"])
+      assign()
+    end
+    return @license["status"]
+
+  end
+
+  def verify_by_api_token(api_token)
+    @options = { query: {device: "SXlite", api_token: api_token, skey: @secret, token: SECRETS_CONFIG['provision_key']} }
+    response = self.class.get("/verify", @options)
+
+    @license = response.parsed_response
+
+    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+    if (@license["status"])
+      assign()
+    end
+
+    return @license["status"]
+  end
+  #Load License is remove from the cloud license because - this license is must be validated against subdmain instead of license.data from file.
+
+
+  def expired?
+    if (self.plan_next_renewal_date < Date.today)
+      return true
+    else
+      return false
+    end
+  end
+
+  private
+   def assign
+    # self.name = @license["name"]
+    # self.address_1 = @license["address_1"]
+    # self.address_2 = @license["address_2"]
+    # self.township = @license["township"]
+    # self.city = @license["city"]
+    # self.country = @license["country"]
+    # self.email = @license["email"]
+    # self.phone = @license["phone"]
+    # self.fax = @license["fax"]
+    # self.logo = @license["logo"]
+    # self.localhost_address = @license["localhost_address"]
+    # self.subdomain = @license["subdomain"]
+    # self.plan_activation_date = Date.parse(@license["plan_activation_date"])
+    # self.plan_next_renewal_date = Date.parse(@license["plan_next_renewal_date"])
+
+    ## self.plan_activation_date = Date.strptime(@license["plan_activation_date"], "%Y-%m-%d")
+    ## self.plan_next_renewal_date = Date.strptime(@license["plan_next_renewal_date"], "%Y-%m-%d")
+
+
+    # self.plan_max_products = @license["plan_max_products"].to_i
+    # self.plan_max_customers = @license["plan_max_customers"].to_i
+    # self.plan_active_connections = @license["plan_active_connections"].to_i
+    salt = @license["secret_key"]
+
+    if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] )
+      self.dbhost = AESCrypt.decrypt(@license["dbhost"], salt)
+      self.dbschema = AESCrypt.decrypt(@license["dbschema"], salt)
+      self.dbusername = AESCrypt.decrypt(@license["dbusername"], salt)
+      self.dbpassword = AESCrypt.decrypt(@license["dbpassword"], salt)
+    end
+
+    # self.exchange_unqiue_id = @license["exchange_unqiue_id"]
+
+    # self.localqueue_host= @license["localqueue_host"]
+    # self.localqueue_user= @license["localqueue_user"]
+    # self.localqueue_password= @license["localqueue_password"]
+
+    # self.remotequeue_host = @license["remotequeue_host"]
+    # self.remotequeue_user = @license["remotequeue_user"]
+    # self.remotequeue_password = @license["remotequeue_password"]
+
+    # self.api_token = @license["api_token"]
+    # self.app_token = @license["app_token"]
+  end
+end

From 9ff01a09f5920618dea0bb5e09ce97561b9c8a2c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Oct 2017 09:52:13 +0630
Subject: [PATCH 11/18] change wathon ip

---
 config/sx.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/sx.yml b/config/sx.yml
index 6bcab70c..378f6837 100644
--- a/config/sx.yml
+++ b/config/sx.yml
@@ -1,6 +1,6 @@
 development:
  server_mode: cloud #local
- sx_provision_url: http://192.168.1.75:3002/api
+ sx_provision_url: http://192.168.1.162:3005/api
 
  
 test:

From d487601802513c6df1b003f33dc7837847bbab30 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Oct 2017 11:06:22 +0630
Subject: [PATCH 12/18] add aes crypt gem

---
 Gemfile      | 3 +++
 Gemfile.lock | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index 93b245eb..b579dfdc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,6 +62,9 @@ gem 'jbuilder', '~> 2.5'
 # Use ActiveModel has_secure_password
 gem 'bcrypt', '~> 3.1.7'
 
+# Crypto
+gem 'aescrypt'
+
 gem 'sidekiq'
 gem 'whenever', :require => false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b2a6e59c..85bd8aa5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,7 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    aescrypt (1.0.0)
     arel (8.0.0)
     autoprefixer-rails (7.1.1.2)
       execjs
@@ -257,6 +258,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aescrypt
   bcrypt (~> 3.1.7)
   bootstrap (~> 4.0.0.alpha3)
   bootstrap-datepicker-rails

From a0ddef16c3d09bde68f4f0ed8055086565fe0760 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Oct 2017 14:28:33 +0630
Subject: [PATCH 13/18] change api key

---
 config/secrets.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index 097a13b9..f81a9056 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
-  provision_key: siPExnkwlHvAXkyQERzAWhNDwpuvnbqsTXoEHaxc
+  provision_key: IAAXHpbSWAfvlWGYpDoXvZdmuRABNGk
 
 test:
   secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
@@ -21,5 +21,5 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
-  provision_key: siPExnkwlHvAXkyQERzAWhNDwpuvnbqsTXoEHaxc
+  provision_key: IAAXHpbSWAfvlWGYpDoXvZdmuRABNGk
 

From 8933dde41d4b07bcd15e0f6f491d2f6f31a3f107 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Oct 2017 15:53:08 +0630
Subject: [PATCH 14/18] add promotion activation in cashier req bill

---
 app/controllers/origami/request_bills_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 7fa51da4..d1330880 100644
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -24,6 +24,9 @@ class Origami::RequestBillsController < BaseOrigamiController
       # Bind shift sale id to sale
       @sale_data.shift_sale_id = shift.id
       @sale_data.save
+
+      # Promotion Activation
+      Promotion.promo_activate(@sale)
     else
       @status = false
       @error_message = "No Current Open Shift for This Employee"

From c7632a4c768cd32b2f5a8163169d9e94dae71aa0 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Oct 2017 17:18:48 +0630
Subject: [PATCH 15/18] add default db connect if fail

---
 app/controllers/application_controller.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6f8eec9a..2a42050b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -13,18 +13,19 @@ class ApplicationController < ActionController::Base
   #response format must be set to JSON
 
   def lookup_domain
-    # if request.subdomain.present? && request.subdomain != "www"
+    if request.subdomain.present? && request.subdomain != "www"
       @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase)
       if (!@license.nil?)
         # logger.info "Location - " + @license.name
         ActiveRecord::Base.establish_connection(website_connection(@license))
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
       else
+        # reconnect_default_db
         logger.info 'License is nil'
         # redirect_to root_url(:host => request.domain) + "store_error"
-        render :json => [{ status: false, message: 'Invalid Access!'}]
+         render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    # end
+    end
   end
 
   def current_license(url, key)
@@ -48,6 +49,10 @@ class ApplicationController < ActionController::Base
 
   end
 
+  def reconnect_default_db
+    ActiveRecord::Base.establish_connection(Rails.env)
+  end
+
   # Regular database.yml configuration hash
   def default_connection
     @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup

From 2a9b44366a53ea9885715c93b5c7de5e62616809 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Oct 2017 10:21:44 +0630
Subject: [PATCH 16/18] check login key

---
 app/views/home/index.html.erb | 3 ++-
 app/views/home/show.html.erb  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 83d43ea8..a8a6d85c 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -148,12 +148,13 @@
             console.log($(this).data("formid"));
             var item = $(this).data("formid");
             $(item).submit();
-
         });
+
         // Add minus icon for collapse element which is open by default
         $(".collapse.in").each(function () {
             $(this).siblings(".panel-heading").find(".glyphicon").addClass("glyphicon-minus").removeClass("glyphicon-plus");
         });
+        
         // Toggle plus minus icon on show hide of collapse element
         $(".collapse").on('show.bs.collapse', function () {
             $(this).parent().find(".glyphicon").removeClass("glyphicon-plus").addClass("glyphicon-minus");
diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb
index a6ffe486..109ccc61 100644
--- a/app/views/home/show.html.erb
+++ b/app/views/home/show.html.erb
@@ -40,9 +40,8 @@
 
 <script type="text/javascript">
     $(document).on('turbolinks:load', function () {
-        $(".pin_pad").click(function (event) {
-            event.preventDefault();
-            console.log($(this).data("value"));
+        $(".pin_pad").click(function(event) {
+            event.preventDefault();            
             var value = $(this).data("value");
 
             if (value == "CLR") {
@@ -51,6 +50,7 @@
                 $("#new_login_form").submit();
             } else {
                 var old_value = $("#login_form_password").val();
+                console.log(old_value);
                 $("#login_form_password").val(old_value + value);
             }
         });

From 4ab89efaf24b10eca343a15159115451bb926a95 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Oct 2017 15:16:40 +0630
Subject: [PATCH 17/18] add font for print setting

---
 .../origami/addorders_controller.rb           |  2 +-
 app/controllers/print_settings_controller.rb  |  2 +-
 app/pdf/close_cashier_pdf.rb                  | 13 ++++++++++++-
 app/pdf/crm_order_pdf.rb                      | 14 ++++++++++++++
 app/pdf/order_item_pdf.rb                     | 13 ++++++++++++-
 app/pdf/order_summary_pdf.rb                  | 15 +++++++++++++--
 app/pdf/queue_no_pdf.rb                       | 13 +++++++++++++
 app/pdf/receipt_bill_pdf.rb                   | 19 +++++++++++++++----
 app/pdf/stock_result_pdf.rb                   | 14 +++++++++++++-
 app/views/home/show.html.erb                  | 12 ++++++------
 app/views/layouts/application.html.erb        |  2 --
 app/views/print_settings/_form.html.erb       |  1 +
 .../_print_setting.json.jbuilder              |  2 +-
 app/views/print_settings/index.html.erb       |  2 ++
 app/views/print_settings/show.html.erb        |  4 ++++
 .../20170628103624_create_print_settings.rb   |  3 ++-
 16 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 7f68eba3..8ac82280 100644
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -36,7 +36,7 @@ class Origami::AddordersController < BaseOrigamiController
     if (params[:id])
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])
-      puts @menu.menu_items[1].item_attributes.to_json
+      # puts @menu.menu_items[1].item_attributes.to_json
       return @menu
     else
       MenuCategory.current_menu
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index 5bf654ef..a72319b3 100644
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -70,6 +70,6 @@ class PrintSettingsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def print_setting_params
-      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
+      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
     end
 end
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 34a9779c..1c4f52d5 100644
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -21,7 +21,18 @@ class CloseCashierPdf < Prawn::Document
     #setting page margin and width
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-    # font "public/fonts/#{font_name}".to_s + ".ttf".to_s
+    # db font setup
+    if printer_settings.font != nil
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
     self.header_font_size = 10
diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb
index 22a381ca..dca0ab9b 100644
--- a/app/pdf/crm_order_pdf.rb
+++ b/app/pdf/crm_order_pdf.rb
@@ -18,6 +18,20 @@ class CrmOrderPdf < Prawn::Document
     @half_qty = @qty_width / 2
     #setting page margin and width
     super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height])
+
+    # db font setup
+    if printer_settings.font != nil
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+    
     self.header_font_size = 10
     self.item_font_size = 9
 
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 64df3adb..9f916853 100644
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -16,7 +16,18 @@ class OrderItemPdf < Prawn::Document
     super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
     # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
 
-     # font "public/fonts/#{font_name}".to_s + ".ttf".to_s
+    # db font setup
+    if print_settings.font != nil
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
      # font "public/fonts/Zawgyi-One.ttf"
      # font "public/fonts/padauk.ttf"  
      #font "public/fonts/Chinese.ttf"  
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index d23f2677..098718a2 100644
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -15,9 +15,20 @@ class OrderSummaryPdf < Prawn::Document
 
     super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-    # font "public/fonts/#{font_name}".to_s + ".ttf".to_s
+    # db font setup
+    if print_settings.font != nil
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
     # font "public/fonts/Zawgyi-One.ttf"
-     font "public/fonts/padauk.ttf"
+    # font "public/fonts/padauk.ttf"
     self.header_font_size = 12
     self.item_font_size = 10
 
diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb
index 49e13bd9..504f4b5e 100644
--- a/app/pdf/queue_no_pdf.rb
+++ b/app/pdf/queue_no_pdf.rb
@@ -14,6 +14,19 @@ class QueueNoPdf < Prawn::Document
 
     super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
+    # db font setup
+    if printer_settings.font != nil
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+
     self.header_font_size = 10
     self.item_font_size = 8
 
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 1d9b3f4d..28c33ba6 100644
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -22,7 +22,18 @@ class ReceiptBillPdf < Prawn::Document
     #setting page margin and width
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-    # font "public/fonts/#{font_name}".to_s + ".ttf".to_s
+    # db font setup
+    if printer_settings.font != nil
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
     self.header_font_size = 10
@@ -226,7 +237,7 @@ class ReceiptBillPdf < Prawn::Document
         move_down 5
         y_position = cursor
         move_down 5
-        bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+        bounding_box([0,y_position], :width =>self.item_description_width) do
              text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
@@ -453,8 +464,8 @@ class ReceiptBillPdf < Prawn::Document
         move_down 5
 
         y_position = cursor
-        bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do
-            text "#{printed_status}",:style => :bold, :size => self.header_font_size,:align => :left
+        bounding_box([0, y_position], :width =>self.label_width) do
+            text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
         end    
         bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
             text "Thank You! See you Again", :left_margin => -10, :size => self.item_font_size,:align => :left
diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb
index ef615a9c..4787e9b1 100644
--- a/app/pdf/stock_result_pdf.rb
+++ b/app/pdf/stock_result_pdf.rb
@@ -21,7 +21,19 @@ class StockResultPdf < Prawn::Document
     #setting page margin and width
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-    # font "public/fonts/#{font_name}".to_s + ".ttf".to_s
+    # db font setup
+    if printer_settings.font != nil
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+    
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
     self.header_font_size = 10
diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb
index 109ccc61..4d1096c8 100644
--- a/app/views/home/show.html.erb
+++ b/app/views/home/show.html.erb
@@ -39,18 +39,18 @@
 </div>
 
 <script type="text/javascript">
-    $(document).on('turbolinks:load', function () {
+    $(document).ready(function() {
         $(".pin_pad").click(function(event) {
-            event.preventDefault();            
+            event.preventDefault();         
+            var old_value = $("#login_form_password").val();   
             var value = $(this).data("value");
-
+            console.log(old_value);
+            console.log(value);
             if (value == "CLR") {
                 $("#login_form_password").val("");
             } else if (value == "ENT") {
                 $("#new_login_form").submit();
-            } else {
-                var old_value = $("#login_form_password").val();
-                console.log(old_value);
+            } else {                
                 $("#login_form_password").val(old_value + value);
             }
         });
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index dc73ab8c..b9da59d4 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,8 +9,6 @@
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
 
-    
-
     <!-- oqs -->
     <%= stylesheet_link_tag    'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
     <!-- crm -->
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index f9079f99..31489bc6 100644
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -6,6 +6,7 @@
     <%= f.input :unique_code %>
     <%= f.input :template %>
     <%= f.input :printer_name %>
+    <%= f.input :font %>
     <%= f.input :api_settings %>
     <%= f.input :page_width %>
     <%= f.input :page_height %>
diff --git a/app/views/print_settings/_print_setting.json.jbuilder b/app/views/print_settings/_print_setting.json.jbuilder
index b1835de6..4279afa7 100644
--- a/app/views/print_settings/_print_setting.json.jbuilder
+++ b/app/views/print_settings/_print_setting.json.jbuilder
@@ -1,2 +1,2 @@
-json.extract! print_setting, :id, :name,, :unique_code,, :template,, :db_name,, :db_type,, :db_username,, :db_password,, :printer_name,, :api_settings,, :page_width, :page_height, :print_copies, :created_at, :updated_at
+json.extract! print_setting, :id, :name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies, :created_at, :updated_at
 json.url print_setting_url(print_setting, format: :json)
diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb
index c16a28c2..a66e3f34 100644
--- a/app/views/print_settings/index.html.erb
+++ b/app/views/print_settings/index.html.erb
@@ -18,6 +18,7 @@
         <th>Unique code</th>
         <th>Template</th>
         <th>Printer name</th>
+        <th>Font</th>
         <th>Api settings</th>
         <th>Page width</th>
         <th>Page height</th>
@@ -36,6 +37,7 @@
           <td><%= print_setting.unique_code %></td>
           <td><%= print_setting.template %></td>
           <td><%= print_setting.printer_name %></td>
+          <td><%= print_setting.font %></td>
           <td><%= print_setting.api_settings %></td>
           <td><%= print_setting.page_width %></td>
           <td><%= print_setting.page_height %></td>
diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb
index 46126c4b..79f4d8e9 100644
--- a/app/views/print_settings/show.html.erb
+++ b/app/views/print_settings/show.html.erb
@@ -32,6 +32,10 @@
         <tr>
           <th>Printer name</th>
           <td><%= @print_setting.printer_name %></td>
+        </tr>
+        <tr>
+          <th>Font</th>
+          <td><%= @print_setting.font %></td>
         </tr>
          <tr>
           <th>Api settings</th>
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index 28c0ae57..a560d747 100644
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -3,7 +3,8 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
     create_table :print_settings do |t|
       t.string  :name, :null => false
       t.string  :unique_code, :null => false
-      t.string  :template      
+      t.string  :template  
+      t.string  :font    
       t.string  :printer_name, :null => false
       t.string  :api_settings
       t.decimal :page_width, :null => false, :default => 200

From 476aafa79154e0ab4da19d8ee8bc82722b00ae94 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Oct 2017 17:29:28 +0630
Subject: [PATCH 18/18] add localization

---
 app/controllers/application_controller.rb | 11 ++++++++++-
 app/views/layouts/application.html.erb    |  1 +
 config/application.rb                     |  2 ++
 config/locales/en.yml                     |  1 +
 config/locales/mm.yml                     | 18 ++++++++++++++++++
 config/routes.rb                          |  3 ++-
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 config/locales/mm.yml

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2a42050b..4ba85ed4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   # lookup domain for db from  provision
-  before_action :lookup_domain
+  before_action :lookup_domain, :set_locale
 
   helper_method :current_company,:current_login_employee,:current_user
    # alias_method :current_user, :current_login_employee,:current_user
@@ -12,6 +12,15 @@ class ApplicationController < ActionController::Base
   #all token authentication must be done here
   #response format must be set to JSON
 
+  def set_locale
+    I18n.locale = params[:locale] || I18n.default_locale
+  end
+
+  # RESTful url for localize
+  def default_url_options
+    { locale: I18n.locale }
+  end
+
   def lookup_domain
     if request.subdomain.present? && request.subdomain != "www"
       @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b9da59d4..b6f044b9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -59,6 +59,7 @@
                     </div>
                   <% end %>
           <% end %>
+          <h1><%= t 'welcome' %></h1>
           <%= yield %>  
           </div>   
       </div>
diff --git a/config/application.rb b/config/application.rb
index 78ff63dc..4a8b873a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,6 +13,8 @@ module SXRestaurants
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
+    config.i18n.default_locale = :'en'
+
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
     config.time_zone = 'Asia/Rangoon'    
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ced8af0a..ba4f31fa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,5 @@
 en:
+  welcome: "Welcome"
   views:
     pagination:
       first: "&laquo; First"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
new file mode 100644
index 00000000..69a9131e
--- /dev/null
+++ b/config/locales/mm.yml
@@ -0,0 +1,18 @@
+mm:
+  welcome: "လာပါ"
+  views:
+    pagination:
+      first: "&laquo; ပထမ"
+      last: "အဆံုး &raquo;"
+      previous: "&lsaquo; ေနာက္သို့"
+      next: "ေရ့သို့ &rsaquo;"
+      truncate: "&hellip;"
+  helpers:
+    page_entries_info:
+      one_page:
+        display_entries:
+          zero: "No %{entry_name} found"
+          one: "Displaying <b>1</b> %{entry_name}"
+          other: "Displaying <b>all %{count}</b> %{entry_name}"
+      more_pages:
+        display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 70accbb2..3c24f5bd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@ require 'sidekiq/web'
 
 Rails.application.routes.draw do
 
-
+scope "(:locale)", locale: /en|mm/ do
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
@@ -375,3 +375,4 @@ Rails.application.routes.draw do
   resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
+end