diff --git a/app/assets/stylesheets/orgiami.scss b/app/assets/stylesheets/orgiami.scss
index 392f7700..d94bc702 100644
--- a/app/assets/stylesheets/orgiami.scss
+++ b/app/assets/stylesheets/orgiami.scss
@@ -61,3 +61,11 @@
.purple {
background-color:#7a62d3;
}
+
+.red {
+ background-color:#ff0000;
+}
+
+.green{
+ background-color: #009900
+}
diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb
deleted file mode 100644
index 2df4b266..00000000
--- a/app/controllers/origami/card_payments_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Origami::CardPaymentsController < BaseOrigamiController
-
-
- def index
- end
-
- def create
- end
-
-end
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
new file mode 100644
index 00000000..e92c9535
--- /dev/null
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -0,0 +1,10 @@
+class Origami::OthersPaymentsController < BaseOrigamiController
+
+
+ def index
+ end
+
+ def create
+ end
+
+end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index f64e27e3..bac414ad 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/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
diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb
index 1c3e2247..5946ff49 100644
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/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
diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb
index b02310dc..05952d0d 100644
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/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
diff --git a/app/models/account.rb b/app/models/account.rb
index e1cdc6d3..a950865c 100644
--- a/app/models/account.rb
+++ b/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
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 9c5a75ac..89967e2e 100644
--- a/app/models/menu_item.rb
+++ b/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
diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb
index c99d2dfc..29daa796 100644
--- a/app/models/sale_audit.rb
+++ b/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
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 15fe4c74..8f9b7294 100644
--- a/app/models/sale_payment.rb
+++ b/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!
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 45bfe596..a8301f52 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -223,11 +223,3 @@
-
-
\ No newline at end of file
diff --git a/app/views/origami/card_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
similarity index 100%
rename from app/views/origami/card_payments/index.html.erb
rename to app/views/origami/others_payments/index.html.erb
diff --git a/app/views/origami/request_bills/show.html.erb b/app/views/origami/payments/show.html.erb
similarity index 88%
rename from app/views/origami/request_bills/show.html.erb
rename to app/views/origami/payments/show.html.erb
index 573a63f4..ccd9fd77 100644
--- a/app/views/origami/request_bills/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -4,12 +4,10 @@
-
-
Receipt No : <%=@sale_data.receipt_no rescue ' '%>
- Receipt Date : <%=@sale_data.receipt_date rescue '-'%>
+ Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %>
- Sale Id<% if @sale_data %><%=@sale_data.sale_id %><% end %>
+ Sale Id<% if @sale_data %><%=@sale_data.sale_id %><% end %>