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

app/assets/javascripts/application.js

@@ -17,9 +17,6 @@
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_nested_form
 //= require cable
-//= require tether
-//= require bootstrap/js/popper.min
-//= require bootstrap/js/bootstrap-material-design.min
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js

app/assets/javascripts/custom.js

@@ -26,7 +26,6 @@ $(document).ready(function() {
     var url       = $(this).attr('data-ref');
     var html_text = $(this).siblings( "#delete_text" ).html();
     //var page = url.substring(url.lastIndexOf('/') + 1);    
-    console.log(location.href);
     swal({
         title: "Confirmation",
         text: html_text,
@@ -40,7 +39,7 @@ $(document).ready(function() {
             type: method,
             url: url ,            
             success: function(data) {
-              // console.log(data.url);
+              console.log(data.url);
               location.href = data.url;
             }
          });          

app/assets/javascripts/login.js

@@ -11,7 +11,6 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery_nested_form
 //= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min

app/assets/stylesheets/origami.scss

@@ -158,7 +158,7 @@ select.form-control {
 }
 
 .long{
-	width:43%;
+	width:49%;
 }
 
 .sold {
@@ -240,7 +240,7 @@ select.form-control {
 /* End Colors */
 
 .left{
-	margin-left:20px;
+	margin-left:1px;
 }
 
 .bottom{
@@ -326,3 +326,15 @@ tr.discount-item-row:hover {
     -moz-opacity: 1; /* mozilla */
         
 }
+
+/* For Payment Page */
+
+.payment-long {
+	width:43%;
+}
+
+.payment-left {
+	margin-left: 20px;
+}
+
+/* End Payment Page */

app/controllers/settings/menu_item_instances_controller.rb

@@ -134,10 +134,11 @@ class Settings::MenuItemInstancesController < ApplicationController
       item = MenuItem.find(catID.menu_item_id)
       category = MenuCategory.find(item.menu_category_id)
     end
-    respond_to do |format|
+    render :json => {:status=> "Success", :url => settings_menu_category_simple_menu_item_path(category,catID) }.to_json
-      format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully destroyed.' }
+    # respond_to do |format|
-      format.json { head :no_content }
+    #   format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully destroyed.' }
-    end
+    #   format.json { head :no_content }
+    # end
   end
 
   private

app/controllers/settings/set_menu_items_controller.rb

@@ -105,13 +105,18 @@ class Settings::SetMenuItemsController < ApplicationController
   # DELETE /settings/menu_items/1
   # DELETE /settings/menu_items/1.json
   def destroy
+    # item_id = @settings_menu_item.id
+    # category_id = @settings_menu_item.menu_category
+
     path_to_file = @settings_menu_item.image_path.to_s        
     File.delete(path_to_file) if File.exist?(path_to_file)
     abc = MenuItem.deleteRecursive(@settings_menu_item)
-    respond_to do |format|
+
-      format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully destroyed.' }
+    render :json => {:status=> "Success", :url => settings_menu_category_simple_menu_items_path }.to_json
-      format.json { head :no_content }
+    # respond_to do |format|
-    end
+    #   format.html { redirect_to settings_menu_category_set_menu_items_path(category_id,item_id), notice: 'Menu item was successfully destroyed.' }
+    #   format.json { head :no_content }
+    # end
   end
 
   private

app/controllers/settings/simple_menu_items_controller.rb

@@ -130,10 +130,11 @@ class Settings::SimpleMenuItemsController < ApplicationController
     path_to_file = @settings_menu_item.image_path.to_s        
     File.delete(path_to_file) if File.exist?(path_to_file)
     abc = MenuItem.deleteRecursive(@settings_menu_item)
-    respond_to do |format|
+    render :json => {:status=> "Success", :url => settings_menu_category_simple_menu_items_path }.to_json
-      format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' }
+    # respond_to do |format|
-      format.json { head :no_content }
+    #   format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' }
-    end
+    #   format.json { head :no_content }
+    # end
   end
 
   private

app/models/print_setting.rb

@@ -1,4 +1,4 @@
 class PrintSetting < ApplicationRecord
 	# validations
-	validates_presence_of :name, :unique_code, :font, :api_settings, :printer_name, :page_width, :page_height, :print_copies, :heading_space
+	validates_presence_of :name, :unique_code, :printer_name, :page_width, :page_height
 end

app/models/promotion.rb

@@ -218,7 +218,7 @@ class Promotion < ApplicationRecord
     else
       foc_qty = find_second_item_qty(sale_id, promo_product.item_code)
       # give total qty is 1
-      foc_qty = (foc_qty - foc_qty) + 1
+      #foc_qty = (foc_qty - foc_qty) + 1
 
       item = OrderItem.find_by_item_instance_code(promo_product.item_code)
       # total = item.price * foc_qty

app/views/origami/payments/show.html.erb

@@ -248,15 +248,15 @@
        </div>
        <div class="col-lg-6 col-md-6 col-sm-6">
          <div class="row bottom">
-           <div class="cashier_number border-top border-right border-left long left" data-value="1000" data-type="add">1000</div>
+           <div class="cashier_number border-top border-right border-left payment-long payment-left" data-value="1000" data-type="add">1000</div>
-           <div class="cashier_number border-top border-right border-left long" data-value="3000" data-type="add">3000</div>
+           <div class="cashier_number border-top border-right border-left payment-long" data-value="3000" data-type="add">3000</div>
          </div>
          <div class="row bottom">
-           <div class="cashier_number border-top border-right border-left long left" data-value="5000" data-type="add">5000</div>
+           <div class="cashier_number border-top border-right border-left payment-long payment-left" data-value="5000" data-type="add">5000</div>
-           <div class="cashier_number border-top border-right border-left long" data-value="10000" data-type="add">10000</div>
+           <div class="cashier_number border-top border-right border-left payment-long" data-value="10000" data-type="add">10000</div>
          </div>
           <div class="row bottom">
-           <div class="pay border-top border-right border-left purple left" id="pay">Pay</div>
+           <div class="pay border-top border-right border-left purple payment-left" id="pay">Pay</div>
           </div>
        </div>
      </div>
@@ -264,7 +264,10 @@
  </div>
 </div>
 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
-  <button type="button" class="btn bg-default btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami/table/'+<%= @sale_data.bookings[0].dining_facility_id %>;"> <i class="material-icons">reply</i> Back </button>
+  <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
+    <i class="material-icons">reply</i>
+     Back
+  </button>
   <button type="button" class="btn bg-deep-purple btn-block" id="foc"> FOC </button>
   <button type="button" class="btn bg-red btn-block" id="void"> Void </button>
   <!-- Waiter Buttons -->
@@ -275,12 +278,21 @@
 
 <script>
   $(document).ready(function(){
-    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+    var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
+
+    $("#back").on('click', function() {
+      localStorage.removeItem('cash');
+      window.location.href = '/origami/table/'+ dining_id;
+    });
+
+    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) {

app/views/origami/surveys/index.html.erb

@@ -1,9 +1,9 @@
 <div class="page-header">
  <ol class="breadcrumb">
-  <li class="breadcrumb-item"><a href="<%= origami_path  %>"><%= t("views.right_panel.button.home") %></a></li>
+  <li class="breadcrumb-item"><a href="<%= origami_root_path  %>"><%= t("views.right_panel.button.home") %></a></li>
   <li class="breadcrumb-item active"><%= t("views.right_panel.detail.account") %></li>
   <span class="float-right">
-    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+    <%= link_to t('.back', :default => t("views.btn.back")), origami_root_path %>
   </span>
 </ol>
 </div>

app/views/origami/surveys/new.html.erb

@@ -1,10 +1,10 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= origami_path(1) %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.detail.survey") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.survey") %></li>
-    <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
+
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), root_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), origami_root_path %>
     </span>
   </ol>
 </div>

app/views/settings/menu_item_instances/index.html.erb

@@ -88,7 +88,7 @@
             <% else %>
             <td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ),,:class=>"btn btn-primary waves-effect btn-sm" %></td>
             <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),,:class=>"btn btn-info waves-effect btn-sm" %></td>
-            <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },,:class=>"btn btn-danger waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class=>"btn btn-danger waves-effect btn-sm" %></td>
             <% end %>
           </tr>
         <% end %>

app/views/settings/menu_item_instances/show.html.erb

@@ -56,22 +56,8 @@
           </tr>
         
       </tbody>  
-
+    </table>
-      
-          
     <% if params[:simple_menu_item_id] %>
-          <!-- td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> 
-          <td><button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
-            <%= t("views.btn.delete") %>
-          </button>
-
-          <span class="hidden" id="delete_text">
-              <h6>Are you sure you want to delete this row ?</h6>
-              <h6>This action can't be undo. </h6> 
-          </span></td>-->
-          <% else %>
-          <!-- <td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> 
-          <td>
       <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
         <%= t("views.btn.delete") %>
       </button>
@@ -80,11 +66,16 @@
           <h6>Are you sure you want to delete this row ?</h6>
           <h6>This action can't be undo. </h6> 
       </span>
-          </td>-->
+      <% else %>
+      <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
+        <%= t("views.btn.delete") %>
+      </button>
+
+      <span class="hidden" id="delete_text">
+          <h6>Are you sure you want to delete this row ?</h6>
+          <h6>This action can't be undo. </h6> 
+      </span>
     <% end %>
-
-     
-    </table>
   </div>
 </div>
   </div>

app/views/settings/set_menu_items/index.html.erb

@@ -110,7 +110,6 @@
               <% else %>
               <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
                 <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-              <!--  <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>--></td>
                 <% end %>
               </tr>
               <% end %>

app/views/settings/set_menu_items/show.html.erb

@@ -107,7 +107,8 @@
            <!--  <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->
             <td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
             <%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-           <!--  <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>--></td>
+            <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>             
+           </td>
           </tr>
         <% end %>
       </tbody>

app/views/settings/simple_menu_items/index.html.erb

@@ -113,12 +113,10 @@
                 <% if settings_menu_item.type == "SimpleMenuItem" %>
                 <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
                   <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>                 
-                  <!-- <%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> -->
                 </td>
                 <% else %>
                 <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
                   <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                  <!-- <%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> -->
                 </td>
                 <% end %>
               </tr>

app/views/settings/simple_menu_items/show.html.erb

@@ -116,6 +116,10 @@
 
           <td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
           <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
+          
+          <!-- 
+          <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>
+          -->
           </td>
         </tr>
         <% end %>

config/locales/en.yml

@@ -590,6 +590,7 @@ en:
         edit_btn_txt: "to edit "
         delete_btn_txt: "to delete "
         update_btn_txt: "to update "
+        survey: "Survey"
 
   helpers:
     page_entries_info:

config/routes.rb

@@ -180,7 +180,7 @@ scope "(:locale)", locale: /en|mm/ do
     post '/:sale_id/get_customer' => "customers#get_customer"
 
     get '/:id/surveys', to: "surveys#new"
-    post '/:id/create' => "surveys#create", :as => "create_surveys"
+    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/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }

db/migrate/20170628103624_create_print_settings.rb

@@ -4,11 +4,11 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :name, :null => false
       t.string  :unique_code, :null => false
       t.string  :template  
-      t.string  :font    
+      t.string  :font, :default => ""    
       t.string  :printer_name, :null => false
       t.string  :api_settings
-      t.decimal :page_width, :null => false, :default => 200
+      t.decimal :page_width, :null => false, :default => 210
-      t.decimal :page_height, :null => false, :default => 800
+      t.decimal :page_height, :null => false, :default => 1450
       t.integer :print_copies, :null => false, :default => 1
       t.string :precision
       t.boolean :delimiter

db/seeds.rb

@@ -102,6 +102,10 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val
 units = Lookup.create([{lookup_type:'unit', name: 'PCS', value: 'pcs'},
                        {lookup_type:'unit', name: 'KG', value: 'kg'}])
 
+
+# Country
+countries =  Lookup.create({lookup_type:'country', name: 'Japan', value: 'Japan'})
+
 # Default CUSTOMER
 customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]})
 customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]})
@@ -167,14 +171,14 @@ admin_employee = Employee.create({name: "Waiter", role: "waiter", password: "111
 admin_employee = Employee.create({name: "Waiter 2", role: "waiter", password: "22222", emp_id:"222", created_by: "SYSTEM DEFAULT"})
 admin_employee = Employee.create({name: "Cashier", role: "cashier", password: "33333", emp_id:"333", created_by: "SYSTEM DEFAULT"})
 
-order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5",font:""})
+order_item_printer=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
-order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5",font:""})
+order_summary_printer=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
-request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5",font:""})
+request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
-close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: "CloseCashierPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5",font:""})
+close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: "CloseCashierPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
-crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5",font:""})
+crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
-queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5",font:""})
+queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: 0, heading_space: 5, page_width: 210, page_height: 1450})
 
-cashier_terminal = CashierTerminal.create({name:"Terminal 1"})
+cashier_terminal = CashierTerminal.create({name:"Terminal 1", printer_name: "Cashier"})
 
 zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"})
   table = Table.create({name:"61", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})