Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

2017-11-22 18:40:38 +06:30
parent f8e6291d1b fafd6df5e1
commit 06582d755e
11 changed files with 73 additions and 35 deletions
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -95,7 +95,6 @@ $(function() {
        var menu_items_list = $('.menu_items_list');
        menu_items_list.empty();
        menu_items = data.menu_items;
-        console.log(menu_items);

        for(var field in menu_items) {  
          if (menu_items[field].is_sub_item == false) {
@@ -194,6 +193,7 @@ $(function() {
  $(document).on('click', '.set_item_box', function(event){ 
    $(".instance-list").empty();
    $(".options-list").empty();
+    $('.set_change_qty').val(1);
    change_qty_plus_minus("set_count","set_plus","set_minus");
    data =  $(this).parent().children().children('.add_icon');

@@ -373,6 +373,8 @@ $(function() {
    $('.add_to_order').removeAttr('data-attributes');
    $('.add_to_order').removeAttr('data-options');

+    $('.change_qty').val(1);
+
    change_qty_plus_minus("count","plus","minus");

    data =  $(this).parent().children().children('.add_icon');
@@ -513,7 +515,6 @@ $(function() {
  // click select option icon for add 
  $(document).on('click', '.option_btn', function(event){ 
    active =$(this).hasClass('selected-option');
-    console.log(active);
    value      = $(this).data('value');
    type       = $(this).data('type');
    group      = $(this).data('group');
@@ -558,8 +559,23 @@ $(function() {

    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)) {
+      
+
+      for(var field in instances) {   
+        
+      attrbu = JSON.stringify(attribute_arr);
+      instan = JSON.stringify(instances[field].values);   
+      var newarr = new Set(instan);
+
+      result = false;
+      for(var i in attrbu) {   
+          if (newarr.has(attrbu[i])) {
+            result = true;
+            break;
+          }
+
+      }
+        if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values) || result) {
          $('.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);
@@ -872,7 +888,7 @@ $(function() {

        id = $(this).attr('id');
        value = $(this).val();
-        $('#count').attr('value',value);
+        $('.change_qty').attr('value',value);
        if (id=="count") {
          price = $("#unit_price").text();
          $("#total_price").text(value*price);
@@ -880,7 +896,7 @@ $(function() {
          var item_row      = $('.selected-instance');
          price             = $("#set_unit_price").text();
          set_total_price   = $("#set_total_price").text();
-          $("#set_count").val(value);
+          $(".set_change_qty").val(value);
          if (item_row.length > 1) {
            total = 0 ;
            $(item_row).each(function(i){
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -45,7 +45,7 @@ class HomeController < ApplicationController
      elsif @employee.role == "manager"
        session[:session_token] = @employee.token_session
        redirect_to dashboard_path
-      elsif @employee.role == "supervisour"
+      elsif @employee.role == "supervisor"
        session[:session_token] = @employee.token_session
        redirect_to origami_root_path
      elsif @employee.role == "account"
@@ -151,7 +151,7 @@ class HomeController < ApplicationController
      redirect_to oqs_root_path
    elsif employee.role == "crm"
      redirect_to crm_root_path
-    elsif @employee.role == "supervisour"
+    elsif @employee.role == "supervisor"
        redirect_to origami_root_path
    elsif @employee.role == "account"
        redirect_to reports_dailysale_index_path
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -122,7 +122,7 @@ class Ability
        can :index, :credit_payment
        can :index, :void_sale

-    elsif user.role == "supervisour"
+    elsif user.role == "supervisor"

        can :edit, :sale_edit
        can :item_void, :sale_edit
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -45,7 +45,7 @@ class ReceiptBillPdf < Prawn::Document
        delimiter = ""
    end

-    header( shop_details)
+    header(shop_details)

    stroke_horizontal_rule

@@ -60,12 +60,14 @@ class ReceiptBillPdf < Prawn::Document

    customer(customer_name)

-    if discount_price_by_accounts.length > 0
+    if discount_price_by_accounts.length > 0 && shop_details.show_account_info
        discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
    end

-    items_account(item_price_by_accounts,printer_settings.precision,delimiter)
-    
+    if shop_details.show_account_info
+       items_account(item_price_by_accounts,printer_settings.precision,delimiter)
+    end
+
    sign(sale_data)

    footer(printed_status)
@@ -389,6 +391,8 @@ class ReceiptBillPdf < Prawn::Document
             text "#{ customer_name }" , :size => self.item_font_size,:align => :right
        end
    end
+
+
    def discount_account(discount_price_by_accounts,precision,delimiter)
        move_down 5
        stroke_horizontal_rule
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -85,7 +85,7 @@

                <div class="row m-b-15">
                    <% @employees.each do |employee| %>
-                        <%if employee.role == "supervisour" %>
+                        <%if employee.role == "supervisor" %>
                            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
                                <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                </form>
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -51,7 +51,7 @@
                     <th class="item-attr">Price</th>
                   </tr>
                 </thead>
-                 <tbody>
+                 <tbody class="font-13">
                 
                 </tbody>
               </table>
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -143,7 +143,7 @@
                <div class="row p-l-5 p-r-5">
                  <% if (!@sale_array.empty?) && (!@date.nil?) %>
                    <div class="col-lg-6 col-md-6 col-sm-6">
-                       Receipt No: <span id="receipt_no">
+                      &nbsp; Receipt No: <span id="receipt_no">
                         <% if @status_sale == 'sale' %>
                           <%= @sale_array[0].receipt_no rescue '' %>

@@ -152,12 +152,12 @@
                       <br>
                    </div>
                    <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
+                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %></span>
                      <br>
                    </div>
                  <% elsif !@date.nil? %>
-                    <div class="col-lg-6 col-md-6 col-sm-6">
-                       Order No: <span id="order_no">
+                    <div class="col-lg-7 col-md-7 col-sm-7">
+                      &nbsp; Order No: <span id="order_no">
                         <% if @status_order == 'order' %>
                           <%= @obj_order.order_id rescue '' %>

@@ -165,8 +165,8 @@
                       </span>
                       <br>
                    </div>
-                    <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
+                    <div class="col-lg-5 col-md-5 col-sm-5 text-right">
+                      Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %></span>
                      <br>
                    </div>
                  <% end %>
@@ -176,11 +176,11 @@
                   
                      <% if @status_sale == 'sale' %>
                          <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
-                          Customer : <%= @sale_array[0].customer.name rescue '' %>
+                          &nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
                      <% elsif @status_order == 'order'
                         %>
                          <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
-                          Customer : <%= @customer.name rescue "" %>
+                          &nbsp; Customer : <%= @customer.name rescue "" %>
                      <% end %>
                    
                </div>
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -137,26 +137,41 @@
       </div>
       <div class="card-block">
         <div class="card-title row p-l-5 p-r-5">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-              Receipt No: <span id="receipt_no">
-               <% if @status_sale == 'sale' %>
+           
+            <% if @status_sale == 'sale' %>
+            <div class="col-lg-6 col-md-6 col-sm-6">
+            &nbsp;  Receipt No: 
+              <span id="receipt_no">
                 <%= @obj_sale.receipt_no rescue '' %>
-
-               <% end %>
-             </span>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+              </span>
+              </div>
+             <% else %>
+             <div class="col-lg-7 col-md-7 col-sm-7">
+             &nbsp; Order No: 
+              <span id="receipt_no">
+                 <%= @obj_order.order_id rescue '' %>
+              </span>
+              </div>
+            <% end %>
+           <% if @status_sale == 'sale' %>
+            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
            Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
           </div>
+             <% else %>
+               <div class="col-lg-5 col-md-5 col-sm-5 text-right">
+                Date:  <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-'%></span>
+               </div>
+            <% end %>
+           
         </div>
         <div class="card-title row customer_detail p-l-5 p-r-5" >
           <div class="col-lg-6 col-md-6 col-sm-6">
             <% if @status_sale == 'sale' %>
              <p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p>
-               Customer : <%= @obj_sale.customer.name rescue '-' %>
+              &nbsp; Customer : <%= @obj_sale.customer.name rescue '-' %>
             <%else%>
               <p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p>
-               Customer : <%= @customer.name rescue "-" %>
+              &nbsp; Customer : <%= @customer.name rescue "-" %>
             <%end%>
           </div>

--- a/app/views/settings/shops/_form.html.erb
+++ b/app/views/settings/shops/_form.html.erb
@@ -15,12 +15,13 @@
    <%= f.input :license_data %>
    <%= f.input :base_currency %>
    <%= f.input :cloud_token %>
-     <%= f.input :cloud_url %>
+    <%= f.input :cloud_url %>
    <%= f.input :owner_token %>
    <%= f.input :id_prefix %>
    <%= f.input :is_rounding_adj %>
    <%= f.input :quick_sale_summary %>
    <%= f.input :calc_tax_order %>
+    <%= f.input :show_account_info %>

    
  </div>
--- a/app/views/settings/shops/index.html.erb
+++ b/app/views/settings/shops/index.html.erb
@@ -23,6 +23,7 @@
            <th>Rouding Adj</th>
            <th>View Sale Summary</th>
            <th>Calculate Tax</th>
+            <th>Show Account Info</th>
            <th>Actions</th>
          </tr>
        </thead>
@@ -36,7 +37,7 @@
            <td><%= shop.is_rounding_adj %></td>
            <td><%= shop.quick_sale_summary %></td>
            <td><%= shop.calc_tax_order %></td>
-            
+            <td><%= shop.show_account_info %></td>
            <td>
              <%= link_to t("views.btn.show"), settings_shop_path(shop),:class => 'btn btn-info btn-sm waves-effect' %>
              <%= link_to t("views.btn.edit"), edit_settings_shop_path(shop),:class => 'btn btn-primary btn-sm waves-effect' %> 
--- a/db/migrate/20170530072247_create_shops.rb
+++ b/db/migrate/20170530072247_create_shops.rb
@@ -21,6 +21,7 @@ class CreateShops < ActiveRecord::Migration[5.1]
      t.boolean :is_rounding_adj, :default => false
      t.boolean :quick_sale_summary, :default => false
      t.boolean :calc_tax_order, :default => false
+      t.boolean :show_account_info, :default => true
      t.timestamps
    end
  end