From 9310baa81abbc3be0405f2a1c67ef37c2a394040 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 8 Dec 2017 16:42:53 +0630 Subject: [PATCH 1/5] add checkin checkout time in origami --- app/models/dining_facility.rb | 8 ++++---- app/views/origami/home/show.html.erb | 6 +++++- app/views/origami/rooms/show.html.erb | 12 ++++++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 1b245b24..9948ec48 100755 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -78,13 +78,13 @@ class DiningFacility < ApplicationRecord def get_checkout_booking booking = self.get_current_checkout_booking if booking - now = Time.now.utc + now = Time.now.utc.getlocal hr = (now.strftime("%H").to_i).to_int min = (now.strftime("%M").to_i).to_int if !booking.checkout_at.nil? - checkout_at = booking.checkout_at.utc - checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int - checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int + checkout_at = booking.checkout_at.utc.getlocal + checkout_at_hr = (checkout_at.strftime("%H").to_i).to_int + checkout_at_min = (checkout_at.strftime("%M").to_i).to_int checkout_at_min -= min if (checkout_at_hr <= hr) && (checkout_at_min <= 15) return booking diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 780ace0b..6d83f852 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -132,7 +132,11 @@
<% end %> ORDER DETAILS | Table <%= @dining.name rescue "" %> - Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %>
<% elsif @status_sale == 'sale' %>
INVOICE DETAILS | Table <%= @dining.name rescue "" %> diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 0b65eae4..aee41b77 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -132,12 +132,20 @@
<% if @status_order == 'order' %>
ORDER DETAILS | Table <%= @room.name rescue "" %> - Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %>
<% elsif @status_sale == 'sale' %>
INVOICE DETAILS | Table <%= @room.name rescue "" %> - Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %>
<% end %> From 863349092fb923699fe021ab5af82008444ebe53 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 8 Dec 2017 18:28:51 +0630 Subject: [PATCH 2/5] add localization for membership actions and settings --- .../membership_actions/_form.html.erb | 23 ++- .../settings/membership_actions/edit.html.erb | 6 +- .../membership_actions/index.html.erb | 33 ++-- .../settings/membership_actions/new.html.erb | 6 +- .../settings/membership_actions/show.html.erb | 142 +++++++++++------- .../membership_settings/_form.html.erb | 25 ++- .../membership_settings/index.html.erb | 43 ++++-- config/locales/en.yml | 13 ++ 8 files changed, 200 insertions(+), 91 deletions(-) diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb index b2524a1c..d1a3133b 100755 --- a/app/views/settings/membership_actions/_form.html.erb +++ b/app/views/settings/membership_actions/_form.html.erb @@ -22,10 +22,25 @@
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
view_headline <%= t("views.right_panel.header.page_detail") %>
+

+ 1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
+ 2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %>
+ 3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_communication_type_txt") %>
+ 4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_url_txt") %>
+ 5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.auth_token_txt") %>
+ 6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.merchant_account_txt") %>
+ 7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.created_by_txt") %>
+

+
list <%= t("views.right_panel.header.button_lists") %>
+

+ 1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
+

+
list <%= t("views.right_panel.header.link_lists") %>
+

+ 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
+ 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
+

diff --git a/app/views/settings/membership_actions/edit.html.erb b/app/views/settings/membership_actions/edit.html.erb index 10da5370..c804ee06 100755 --- a/app/views/settings/membership_actions/edit.html.erb +++ b/app/views/settings/membership_actions/edit.html.erb @@ -1,9 +1,9 @@
    -
  1. Home
    2. -
  2. Membership Actions
    3. -
  3. Edit
    4. +
  4. <%= t("views.right_panel.button.home") %>
    5. +
  5. <%= t("views.right_panel.detail.setting_membership_actions") %>
    6. +
  6. <%= t("views.btn.edit") %>
    7. <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb index 4823889d..d4bb8d8d 100755 --- a/app/views/settings/membership_actions/index.html.erb +++ b/app/views/settings/membership_actions/index.html.erb @@ -1,7 +1,7 @@
      -
    1. Home
      2. -
    2. Settings Membership Actions
      3. +
    3. <%= t("views.right_panel.button.home") %>
      4. +
    4. <%= t("views.right_panel.detail.setting_membership_actions") %>
      5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -20,11 +20,11 @@ - + - + - + @@ -48,10 +48,25 @@
      - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
      + view_headline <%= t("views.right_panel.header.page_detail") %> +
      +

      + 1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %>
      + 2) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.merchant_account_txt") %>
      + 3) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      +

      +
      list <%= t("views.right_panel.header.button_lists") %>
      +

      + 1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      + 2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      + 3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      +

      +
      list <%= t("views.right_panel.header.link_lists") %>
      +

      + 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
      + 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %>
      +

      diff --git a/app/views/settings/membership_actions/new.html.erb b/app/views/settings/membership_actions/new.html.erb index d32bb6e7..c6dc0b89 100755 --- a/app/views/settings/membership_actions/new.html.erb +++ b/app/views/settings/membership_actions/new.html.erb @@ -1,9 +1,9 @@
        -
      1. Home
        2. -
      2. Membership Actions
        3. -
      3. New
        4. +
      4. <%= t("views.right_panel.button.home") %>
        5. +
      5. <%= t("views.right_panel.detail.setting_membership_actions") %>
        6. +
      6. <%= t("views.btn.new") %>
        7. <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/show.html.erb b/app/views/settings/membership_actions/show.html.erb index 58193063..4bfbb6b2 100755 --- a/app/views/settings/membership_actions/show.html.erb +++ b/app/views/settings/membership_actions/show.html.erb @@ -1,69 +1,101 @@
          -
        1. Home
          2. -
        2. Membership Actions
          3. -
        3. Details
          4. +
        4. <%= t("views.right_panel.button.home") %>
          5. +
        5. <%= t("views.right_panel.detail.setting_membership_actions") %>
          6. +
        6. <%= t :details %>
          7. <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %>
        -
        -
        -
      Membership type<%= t("views.right_panel.detail.membership_type") %> Merchant account<%= t("views.right_panel.detail.merchant_account") %>Actions<%= t("views.right_panel.detail.actions") %>
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Membership type<%= @settings_membership_action.membership_type %>
      Is active<%= @settings_membership_action.is_active %>
      Gateway communication type<%= @settings_membership_action.gateway_communication_type %>
      Gateway url<%= @settings_membership_action.gateway_url %>
      Auth token<%= @settings_membership_action.auth_token %>
      Merchant account<%= @settings_membership_action.merchant_account_id %>
      Created by<%= @settings_membership_action.created_by %>
      Additional parameter<%= @settings_membership_action.additional_parameter %>
      - <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %> - - -
      +
      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      <%= t("views.right_panel.detail.membership_type") %><%= @settings_membership_action.membership_type %>
      <%= t("views.right_panel.detail.is_active") %><%= @settings_membership_action.is_active %>
      <%= t("views.right_panel.detail.gateway_communication_type") %><%= @settings_membership_action.gateway_communication_type %>
      <%= t("views.right_panel.detail.gateway_url") %><%= @settings_membership_action.gateway_url %>
      <%= t("views.right_panel.detail.auth_token") %><%= @settings_membership_action.auth_token %>
      <%= t("views.right_panel.detail.merchant_account") %><%= @settings_membership_action.merchant_account_id %>
      <%= t("views.right_panel.detail.created_by") %><%= @settings_membership_action.created_by %>
      <%= t("views.right_panel.detail.additional_parameter") %><%= @settings_membership_action.additional_parameter %>
      + <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %> + + + +
      +
      +
      +
      +
      +
      +
      +
      <%= t("views.right_panel.header.membership_actions") %>
      +
      view_headline <%= t("views.right_panel.header.page_detail") %>
      +

      + 1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %>
      + 2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.is_active_txt") %>
      + 3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.gateway_communication_type_txt") %>
      + 4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.gateway_url_txt") %>
      + 5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.auth_token_txt") %>
      + 6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.merchant_account_txt") %>
      + 7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      + 8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      +

      +
      list <%= t("views.right_panel.header.button_lists") %>
      +

      + 1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      + 2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %>
      +

      +
      list <%= t("views.right_panel.header.link_lists") %>
      +

      + 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
      + 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %>
      +

      +
      +
      -
    diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb index 19361bb4..10aefcb5 100755 --- a/app/views/settings/membership_settings/_form.html.erb +++ b/app/views/settings/membership_settings/_form.html.erb @@ -24,10 +24,27 @@
    - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
    view_headline <%= t("views.right_panel.header.page_detail") %>
    +

    + 1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt2") %>
    + 2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.is_active_txt") %>
    + 3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_communication_type_txt") %>
    + 4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_url_txt") %>
    + 5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.auth_token_txt") %>
    + 6) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.discount_txt") %>
    + 7) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %>
    + 8) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.bonus_txt") %>
    + 9) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %>
    +

    +
    list <%= t("views.right_panel.header.button_lists") %>
    +

    + 1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.membership_setting_txt") %>
    +

    +
    list <%= t("views.right_panel.header.link_lists") %>
    +

    + 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
    + 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.membership_setting_txt") %>
    +

    diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb index d9d752db..ace63190 100755 --- a/app/views/settings/membership_settings/index.html.erb +++ b/app/views/settings/membership_settings/index.html.erb @@ -1,8 +1,8 @@
      -
    1. Home
      2. -
    2. Membership Setting
      3. +
    3. <%= t("views.right_panel.button.home") %>
      4. +
    4. <%= t("views.right_panel.detail.membership_setting") %>
      5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -17,16 +17,16 @@ - - - + + + - - - - + + + + @@ -55,10 +55,27 @@
      - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
      + view_headline <%= t("views.right_panel.header.page_detail") %> +
      +

      + 1) <%= t("views.right_panel.detail.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt") %>
      + 2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.is_active_txt") %>
      + 3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.gateway_communication_type_txt") %>
      + 4) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.discount_txt") %>
      + 5) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.rebate_txt") %>
      + 6) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.bonus_txt") %>
      + 7) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.point_txt") %>
      +

      +
      list <%= t("views.right_panel.header.button_lists") %>
      +

      + 1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.membership_setting_txt") %>
      +

      +
      list <%= t("views.right_panel.header.link_lists") %>
      +

      + 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
      + 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %>
      +

      diff --git a/config/locales/en.yml b/config/locales/en.yml index 6df121fb..f47f9aaf 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -156,6 +156,9 @@ en: cashier_terminal: "Cashier Terminal" print_settings: "Print Settings" transaction_sales: "Transactions Sales" + setting_membership_actions: "Setting Membership Actions" + membership_actions: "Membership Actions" + membership_setting: "Membership Setting" button: new: "NEW" create: "CREATE" @@ -438,6 +441,9 @@ en: dine_in: "Dine in" takeaway: "Takeaway" membership: "Membership" + gateway_communication_type: "Gateway communication type" + gateway_url: "Gateway url" + additional_parameter: "Additional parameter" code_txt: "code " charge_txt: "charge" @@ -597,6 +603,13 @@ en: no_data_txt: "There is no data for search" assign_txt: "to assign " remove_txt: "to remove " + membership_type_txt: "membership type" + merchant_account_txt: "merchant account" + membership_actions_txt: "membership actions" + gateway_communication_type_txt: "gateway communication type" + gateway_url_txt: "gateway url" + membership_setting_txt: "membership setting" + cancel_btn_txt: "to cancel " image_btn_txt: "to upload " create_btn_txt: "to create " From 01ead63d19f2bbbd09c9b75eedb1e8461d761265 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 11 Dec 2017 10:16:56 +0630 Subject: [PATCH 3/5] change UI for report filter --- .../reports/dailysale/_shift_sale_report_filter.html.erb | 4 ++-- .../reports/receipt_no/_shift_sale_report_filter.html.erb | 6 +++--- .../reports/saleitem/_shift_sale_report_filter.html.erb | 4 ++-- .../reports/shiftsale/_shift_sale_report_filter.html.erb | 6 +++--- .../reports/stock_check/_stock_check_report_filter.html.erb | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) 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 e584bbba..d3afcbfe 100755 --- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb @@ -24,11 +24,11 @@
      - +
      - +

      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 2534eba0..a1db6824 100755 --- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -27,15 +27,15 @@
      - +
      - +
      -
      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 c913b592..88f26c1f 100755 --- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb +++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb @@ -22,11 +22,11 @@
      - +
      - +
      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 f1a07e33..b519adf9 100755 --- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb @@ -22,15 +22,15 @@
      - +
      - +
      -

      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 a058d442..4be0bf46 100755 --- a/app/views/reports/stock_check/_stock_check_report_filter.html.erb +++ b/app/views/reports/stock_check/_stock_check_report_filter.html.erb @@ -14,11 +14,11 @@
      - +
      - +
      From 0dce6e4329eee130ecffc4f215a8c08eb4a0f32d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 11 Dec 2017 10:39:19 +0630 Subject: [PATCH 4/5] udate add order controller --- app/controllers/origami/addorders_controller.rb | 1 + app/controllers/origami/discounts_controller.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 8098dfe9..20b098dc 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -10,6 +10,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController def detail @menu = MenuCategory.all.active + #@menu = MenuCategory.where("menu_category_id is NULL").active @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 59de9f6d..e0739e88 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -29,8 +29,6 @@ class Origami::DiscountsController < BaseOrigamiController # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax; # sale.save if discount_items.length > 0 - puts discount_items.to_json - puts "dddddddddddd" #save sale item for discount discount_items.each do |di| From 66964a6926fb54430a78845bd532bd7eb111a489 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 11 Dec 2017 18:01:19 +0630 Subject: [PATCH 5/5] update crm addore --- app/controllers/crm/customers_controller.rb | 2 +- app/controllers/origami/addorders_controller.rb | 12 +++++++++++- app/pdf/receipt_bill_pdf.rb | 15 +++++++++------ .../addorders/get_menu_sub_category.json.jbuilder | 9 +++++++++ config/routes.rb | 1 + 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 app/views/origami/addorders/get_menu_sub_category.json.jbuilder diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index fdeb6fe1..51ddc9eb 100755 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -74,7 +74,7 @@ class Crm::CustomersController < BaseCrmController @response = Customer.get_membership_transactions(@customer) Rails.logger.debug "get membership transactions response" - Rails.logger.debug response.to_json + Rails.logger.debug @response.to_json # @response = "" #end customer amount diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 20b098dc..d283b06e 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -10,7 +10,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController def detail @menu = MenuCategory.all.active - #@menu = MenuCategory.where("menu_category_id is NULL").active @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking @@ -44,6 +43,17 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController MenuCategory.current_menu end end + + + def get_menu_sub_category () + id = params[:id] + if (id) + #Pull this menu + @sub_menu = MenuCategory.where("menu_category_id = #{id}").active + # puts @menu.menu_items[1].item_attributes.to_json + return @sub_menu + end + end def get_all_product() @product = Product.all diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index a62e7b90..c48dfa7f 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -294,6 +294,7 @@ class ReceiptBillPdf < Prawn::Document balance = 0 rebate_balance =0 redeem = 0 + redeem_count = 0 rebate_amount["data"].each do |res| total = total + res["balance"] #total redeem amount @@ -318,7 +319,7 @@ class ReceiptBillPdf < Prawn::Document end # Total Rebate Amount if birthday - if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateBonusAccount" && res["status"]== "Rebate" + if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate" rebate_balance = rebate_balance + res["deposit"] move_down 5 y_position = cursor @@ -332,20 +333,22 @@ class ReceiptBillPdf < Prawn::Document #end Total rebate if birthday end - move_down 5 + move_down 5 y_position = cursor - 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, :height => self.item_height) do text "Redeem Amount", :size => self.item_font_size,:align => :left - end + end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right - end + end if redeem == 0 old = total - rebate_balance else - old = balance + redeem + # if redeem_count == 0 + old = balance + redeem + # end end move_down 5 diff --git a/app/views/origami/addorders/get_menu_sub_category.json.jbuilder b/app/views/origami/addorders/get_menu_sub_category.json.jbuilder new file mode 100644 index 00000000..d391e4c5 --- /dev/null +++ b/app/views/origami/addorders/get_menu_sub_category.json.jbuilder @@ -0,0 +1,9 @@ +if @sub_menu + json.sub_category @sub_menu.each do |sub_cat| + json.id sub_cat.id + json.code sub_cat.code + json.name sub_cat.name + json.menu_id sub_cat.menu_id + json.menu_category_id sub_cat.menu_category_id + end +end diff --git a/config/routes.rb b/config/routes.rb index 93fe22e2..4c302b94 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -189,6 +189,7 @@ scope "(:locale)", locale: /en|mm/ do post '/:id/create_survey' => "surveys#create", :as => "create_surveys" get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' } + get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' } get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' } get '/:addorders/:id' => "addorders#detail"
      Membership typeIs activeGateway communication type<%= t("views.right_panel.detail.membership_type") %><%= t("views.right_panel.detail.is_active") %><%= t("views.right_panel.detail.gateway_communication_type") %> DiscountRebateBonusPoints<%= t("views.right_panel.detail.discount") %><%= t("views.right_panel.detail.rebate") %><%= t("views.right_panel.detail.bonus") %><%= t("views.right_panel.detail.point") %>