merged master

app/assets/stylesheets/orgiami.scss

@@ -61,3 +61,11 @@
 .purple {
 	background-color:#7a62d3;
 }
+
+.red {
+	background-color:#ff0000;
+}
+
+.green{
+	background-color: #009900
+}

app/controllers/origami/card_payments_controller.rb

@@ -1,10 +0,0 @@
-class Origami::CardPaymentsController < BaseOrigamiController
-
-
-  def index
-  end
-
-  def create
-  end
-
-end

app/controllers/origami/others_payments_controller.rb

@@ -0,0 +1,10 @@
+class Origami::OthersPaymentsController < BaseOrigamiController
+
+
+  def index
+  end
+
+  def create
+  end
+
+end

app/controllers/origami/payments_controller.rb

@@ -5,13 +5,20 @@ class Origami::PaymentsController < BaseOrigamiController
   end
 
   def create
-    #payment type
-    #sale status
-    #point - get  [ food amount ]
+    cash = params[:cash]
+    sale_id = params[:sale_id]
+    if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      sale_payment.process_payment(saleObj, @user, cash)
+    end
   end
 
   def show
-
+    sale_id = params[:sale_id]
+    if Sale.exists?(sale_id)
+      @sale_data = Sale.find_by_sale_id(sale_id)
+    end
   end
 
 end

app/controllers/settings/set_menu_items_controller.rb

@@ -81,6 +81,6 @@ class Settings::SetMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
+      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id , :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
     end
 end

app/controllers/settings/simple_menu_items_controller.rb

@@ -78,6 +78,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
+      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
     end
 end

app/models/account.rb

@@ -3,5 +3,7 @@ class Account < ApplicationRecord
 
 	has_many :menu_items
     # belongs_to :lookup , :class_name => "Lookup"
-
+    def self.collection
+	    Account.select("id, title").map { |e| [e.title, e.id] }
+	  end
 end

app/models/menu_item.rb

@@ -1,10 +1,10 @@
 class MenuItem < ApplicationRecord
 
-  #belongs_to :account
   belongs_to :menu_category, :optional => true
   has_many :menu_item_instances
   belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true
   has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id"
+  belongs_to :account
 
   validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item
 

app/models/sale_audit.rb

@@ -1,6 +1,6 @@
 class SaleAudit < ApplicationRecord
   self.primary_key = "sale_audit_id"
-  
+
   #primary key - need to be unique generated for SaleAudit
   before_create :generate_custom_id
 
@@ -44,13 +44,14 @@ class SaleAudit < ApplicationRecord
     sale_audit.save!
   end
 
-  def record_payment(sale_id, remark, action_by)
+  def self.record_payment(sale_id, remark, action_by)
     sale_audit = SaleAudit.new()
     sale_audit.sale_id = sale_id
     sale_audit.action = "SALEPAYMENT"
     sale_audit.action_at = DateTime.now.utc
     sale_audit.action_by = action_by
     sale_audit.remark = remark
+    sale_audit.approved_by = Time.now
     sale_audit.save!
   end
 

app/models/sale_payment.rb

@@ -1,17 +1,21 @@
 class SalePayment < ApplicationRecord
   self.primary_key = "sale_payment_id"
-  
+
   #primary key - need to be unique generated for multiple shops
   before_create :generate_custom_id
 
   belongs_to :sale
 
-  :attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
+  attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
+
+  def process_payment(invoice, action_by, cash_amount)
 
-  def process_payment(invoice, action_by)
     self.sale = invoice
-
+    self.received_amount = cash_amount
+    
+    payment_method = "cash"
     amount_due = invoice.grand_total
+
     #get all payment for this invoices
     invoice.sale_payments.each do |payment|
       if (payment.payment_status == "paid" )
@@ -22,32 +26,33 @@ class SalePayment < ApplicationRecord
     if (amount_due > 0)
       payment_status = false
       #route to payment type
-      switch (payment_method)
-        case "cash"
+      case payment_method
+        when "cash"
           payment_status = cash_payment
-        case "creditnote"
-          payment_status = creditnote_payment
-        case "visa"
-          payment_status = external_terminal_card_payment(:visa)
-        case "master"
-          payment_status = external_terminal_card_payment(:master)
-        case "jcb"
-          payment_status = external_terminal_card_payment(:jcb)
-        case "mpu"
-          payment_status = external_terminal_card_payment(:mpu)
-        case "unionpay"
-          payment_status = external_terminal_card_payment(:unionpay)
-        case "vochure"
-          payment_status = vochure_payment
-        case "giftcard"
-          payment_status = giftcard_payment
-        case "paypar"
-          #TODO: implement paypar implementation
+        when "creditnote"
+          if !self.customer_id.nil?
+            payment_status = creditnote_payment(self.customer_id)
+          end
+        when "visa"
+           payment_status = external_terminal_card_payment(:visa)
+        when "master"
+           payment_status = external_terminal_card_payment(:master)
+        when "jcb"
+           payment_status = external_terminal_card_payment(:jcb)
+        when "mpu"
+           payment_status = external_terminal_card_payment(:mpu)
+        when "unionpay"
+           payment_status = external_terminal_card_payment(:unionpay)
+        when "vochure"
+           payment_status = vochure_payment
+        when "giftcard"
+           payment_status = giftcard_payment
+        when "paypar"
           payment_status = paypar_payment
+      else
+         puts "it was something else"
       end
 
-
-
       #record an payment in sale-audit
       remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{amount} | Payment Status ->#{payment_status}"
       sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by)
@@ -66,10 +71,9 @@ class SalePayment < ApplicationRecord
   private
   def cash_payment
     payment_status = false
-
     self.payment_method = "cash"
     self.payment_amount = self.received_amount
-    self.outstanding_amount = self.sale.grand_total - received_amount
+    self.outstanding_amount = self.sale.grand_total - self.received_amount
     self.payment_status = "paid"
     payment_method = self.save!
 
@@ -78,7 +82,8 @@ class SalePayment < ApplicationRecord
     return payment_status
   end
 
-  def creditnote_payment(self.customer_id)
+  def creditnote_payment(customer_id)
+
     payment_status = false
 
     self.payment_method = "creditnote"
@@ -147,11 +152,12 @@ class SalePayment < ApplicationRecord
   end
 
   def sale_update_payment_status(paid_amount)
-
+    puts "paid_amount"
+    puts paid_amount
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received + paid_amount
-    self.sale.amount_changed = amount -   self.sale.amount_received
-    if (self.sale.grand_total <=   self.sale.amount_received &&   self.sale.amount_changed > 0)
+    self.sale.amount_changed = amount - self.sale.amount_received
+    if (self.sale.grand_total <=   self.sale.amount_received && self.sale.amount_changed > 0)
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
       self.sale.save!

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

@@ -223,11 +223,3 @@
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>
-
-<!-- <script type="text/template" id="order-items-rows">
-  <tr>
-    <td class="item-name"></td>
-    <td class="item-qty"></td>
-    <td class="item-price"></td>
-  </tr>
-</script> -->

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

@@ -4,12 +4,10 @@
     <div class="card"  >
       <div class="card-header">
         <div id="order-title">
-
-
         	<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span>
-          <span style="margin-left: 40%"><strong>Receipt Date : <%=@sale_data.receipt_date rescue '-'%></strong></span>
+          <span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span>
         	<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
-          <span><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
+          <span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
         </div>
       </div>
       <div class="card-block">
@@ -89,7 +87,7 @@
     </div>
       <hr>
     <div class="row" id="card_payment">
-      <div class="col-md-8">CARD</div>
+      <div class="col-md-8">OTHERS PAYMENT</div>
       <div class="col-md-4">0.0</div>
     </div>
       <hr>
@@ -152,8 +150,8 @@
              <div class="col-md-7">
                <div class="row">
                  <div class="col-md-3 cashier_number"></div>
-                 <div class="col-md-3 cashier_number">DEL</div>
-                 <div class="col-md-3 cashier_number">CLR</div>
+                 <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
+                 <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
                </div>
              </div>
              <div class="col-md-5">
@@ -174,6 +172,7 @@ $(document).on('click', '.cashier_number', function(event){
             original_value = $('#cash').text();
 
             var input_type = $(this).attr("data-type");
+            
             switch (input_type) {
               case 'num':
               var input_value = $(this).attr("data-value");
@@ -193,6 +192,10 @@ $(document).on('click', '.cashier_number', function(event){
                 update_balance();
               break;
 
+              case 'clr':
+                 $('#cash').text("0.0");
+                 update_balance();
+              break;
           }
           event.handled = true;
         } else {
@@ -209,16 +212,28 @@ $( document ).ready(function() {
 
  $('#card_payment').click(function() {
    var sale_id = $('#sale_id').text();
-    window.location.href = '/origami/sale/'+ sale_id  + "/payment/card_payment"
+    window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
     return false;
  });
 
  $('#pay').click(function() {
-   console.log("pay")
-   if($('#amount_due').text() > 0){
-     console.log("greater")
+
+   if($('#balance').text() > 0){
+      alert(" Insufficient Amount!")
    }else{
-     console.log("less")
+    //  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_process_path %>",
+      data: "cash="+ cash + "&sale_id=" + sale_id,
+      success:function(result){
+        alert("THANK YOU")
+      }
+    });
+
    }
  });
 

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

@@ -2,8 +2,7 @@
 <div class="page-header">
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
-  <li>Menu Item Option</li>
+  <li><a href="<%= settings_menu_item_options_path %>">Menu Item Options</a></li>
   <span style="float: right">
   </span>
  </ul>

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

@@ -34,7 +34,7 @@
           <td><%= settings_payment_method_setting.auth_token %></td>
           <td><%= settings_payment_method_setting.merchant_account_id %></td>
           <td><%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %>
-          | <%= link_to 'Destroy', settings_payment_method_settings_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          | <%= link_to 'Destroy', settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
         </tr>
       <% end %>
     </tbody>

app/views/settings/processing_items/_form.html.erb

@@ -20,9 +20,18 @@
           </div>
         <ul class="opi_ul" id="menu_items_category_<%= category.id %>">
           <% category.menu_items.each do |item| %>
-
-            <li><div class="processitems opi_default" data-id="<%= item.item_code %>"><%= item.name %></div></li>
-
+            <% flag =  false %>
+            <% itemsary = JSON.parse(@settings_order_queue_station.processing_items) %>
+            <% itemsary.each do |item_code| %>
+              <% if item_code ==  item.item_code %>
+                <% flag = true %>
+              <% end %>
+            <% end %>
+            <% if flag == true %>
+              <li><div class="processitems opi_default opi_selected" data-id="<%= item.item_code %>"><%= item.name %></div></li>
+            <% else %>
+              <li><div class="processitems opi_default" data-id="<%= item.item_code %>"><%= item.name %></div></li>
+            <% end %>
           <% end %>
         </ul>
         </div>

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

@@ -6,6 +6,7 @@
     <%= f.input :name %>
     <%= f.input :alt_name %>
     <%= f.input :type %>
+    <%= f.input :account_id, :label => "Account type", :collection => Account.collection %>
     <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
 
     <%= f.input :min_qty %>

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

@@ -19,6 +19,7 @@
           <th>Name</th>
           <th>Alt name</th>
           <th>Type</th>
+          <th>Account Type</th>
           <th>Menu category</th>
           <th>Menu item</th>
           <th>Min qty</th>
@@ -35,6 +36,7 @@
           <td><%= @settings_menu_item.name  rescue "-" %></td>
           <td><%= @settings_menu_item.alt_name %></td>
           <td><%= @settings_menu_item.type %></td>
+          <td><%= @settings_menu_item.account.title %></td>
           <td><%= @settings_menu_item.menu_category_id %></td>
           <td><%= @settings_menu_item.menu_item_id %></td>
           <td><%= @settings_menu_item.min_qty %></td>

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

@@ -6,6 +6,7 @@
     <%= f.input :name %>
     <%= f.input :alt_name %>
     <%= f.input :type %>
+    <%= f.input :account_id, :label => "Account type", :collection => Account.collection %>
     <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
     <%= f.input :min_qty %>
     <%= f.input :min_selectable_item %>

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

@@ -21,6 +21,7 @@
           <th>Name</th>
           <th>Alt name</th>
           <th>Type</th>
+          <th>Accout</th>
           <th>Menu category</th>
           <th>Menu item</th>
           <th>Min qty</th>
@@ -37,6 +38,7 @@
           <td><%= @settings_menu_item.name  rescue "-" %></td>
           <td><%= @settings_menu_item.alt_name %></td>
           <td><%= @settings_menu_item.type %></td>
+          <td><%= @settings_menu_item.account.title %></td>
           <td><%= @settings_menu_item.menu_category_id %></td>
           <td><%= @settings_menu_item.menu_item_id %></td>
           <td><%= @settings_menu_item.min_qty %></td>

config/routes.rb

@@ -68,17 +68,18 @@ Rails.application.routes.draw do
   namespace :origami do
     root "home#index"
     get "/:booking_id" => "home#show" do #origami/:booking_id will show
-      resources :payments, only: [:index, :new, :create ] #add payment by payment_method
       resources :discounts, only: [:index,:new, :create ] #add discount type
       resources :customers, only: [:index,:new, :create ] #add customer type
     end
 
-    # resources :request_bills, only: [:print]
     get "/request_bills/:id" => "request_bills#print"
 
-    get 'sale/:sale_id/payment' => 'request_bills#show'
+    get 'sale/:sale_id/payment' => 'payments#show'
+    post 'payment_process' => 'payments#create'
+
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
-    get 'sale/:sale_id/payment/card_payment' => "card_payments#index"
+    get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
+
   end
 
   #--------- Waiter/Ordering Station ------------#

db/migrate/20170331024749_create_menu_items.rb

@@ -10,6 +10,7 @@ class CreateMenuItems < ActiveRecord::Migration[5.0]
       t.string :type, :null => false, :default => "SimpleMenuItem"
       t.references :menu_category, foreign_key: true
       t.references :menu_item, foreign_key: true
+      t.references :account, foreign_key: true
       t.integer :min_qty, :null => false, :default => 1
       t.boolean :taxable, :null => false, :default => true
       t.integer :min_selectable_item, :null => false, :default => 1

db/migrate/20170403174111_create_sale_audits.rb

@@ -7,8 +7,8 @@ class CreateSaleAudits < ActiveRecord::Migration[5.0]
       t.string :action, :null => false
       t.datetime :action_at, :null => false
       t.string :action_by, :null => false
-      t.string :approved_by, :null => false
-      t.datetime :approved_by, :null => false
+      t.string :approved_by, :null => true
+      t.datetime :approved_at, :null => true
       t.string :remark
       t.timestamps
     end

db/seeds.rb

@@ -90,6 +90,9 @@ room = Room.create({name:"Default Room", zone: zone2, status:"available", seater
 #Tax Profile
 tax_profiles = TaxProfile.create({id:1, name: "Commerical Tax", rate:5.0, order_by:1, created_by:"SYSTEM DEFAULT"})
 
+#Account for Menu Item Type (eg: Food, Beverage)
+food = Account.create({title: "Food", account_type: "0"})
+beverage = Account.create({title: "Beverage", account_type: "1"})
 
 #Default menu
 menu = Menu.create({name: "Default Menu", is_active: true, created_by: "SYSTEM DEFAULT"})
@@ -104,17 +107,17 @@ menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Sample Men
 menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Sample Menu Category 4", alt_name: "Sample Alternate Category 4", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"})
 
 #Default Menu items
-menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 })
+menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
 menu_item0_instance = MenuItemInstance.create([{item_instance_name:"half portion",item_instance_code:"01001-1", menu_item: menu_category1_menu_item0, price:12.00, is_on_promotion:false}])
 menu_item0_instance = MenuItemInstance.create([{item_instance_name:"full portion",item_instance_code:"01001-2", menu_item: menu_category1_menu_item0, price:18.00, is_on_promotion:false}])
 
-menu_category1_menu_item1 = SetMenuItem.create({item_code:"I004", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 })
-menu_category1_menu_item2 = SetMenuItem.create({item_code:"I005", name: "Default Menu Item Name 2",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 2", min_selectable_item: 1, max_selectable_item:1 })
-menu_category1_menu_item3 = SetMenuItem.create({item_code:"I006", name: "Default Menu Item Name 3",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 3", min_selectable_item: 1, max_selectable_item:1 })
+menu_category1_menu_item1 = SetMenuItem.create({item_code:"I004", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 , account: food})
+menu_category1_menu_item2 = SetMenuItem.create({item_code:"I005", name: "Default Menu Item Name 2",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 2", min_selectable_item: 1, max_selectable_item:1 , account: food})
+menu_category1_menu_item3 = SetMenuItem.create({item_code:"I006", name: "Default Menu Item Name 3",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 3", min_selectable_item: 1, max_selectable_item:1 , account: food})
 
-menu_category2_menu_item0 = SimpleMenuItem.create({item_code:"I007", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 })
-menu_category2_menu_item1 = SimpleMenuItem.create({item_code:"I008", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 })
-menu_category2_menu_item2 = SimpleMenuItem.create({item_code:"I009", name: "Default Menu Item Name 2", alt_name: "Alternate Menu Item Name 2",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 3 })
+menu_category2_menu_item0 = SimpleMenuItem.create({item_code:"I007", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 , account: food})
+menu_category2_menu_item1 = SimpleMenuItem.create({item_code:"I008", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 , account: food})
+menu_category2_menu_item2 = SimpleMenuItem.create({item_code:"I009", name: "Default Menu Item Name 2", alt_name: "Alternate Menu Item Name 2",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 3 , account: food})
 
 menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size", name: "Small", value: "small"})
 menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"})
@@ -143,3 +146,4 @@ shop = Shop.create(
     country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", 
     activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"}
   )
+