+
+
+
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 939e1cbf..61c8b00f 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -1,5 +1,5 @@
class Origami::SaleEditController < BaseOrigamiController
- authorize_resource :class => false
+ authorize_resource class: false
# Index for sale item void OR edit
def edit
sale_id = params[:sale_id]
@@ -19,12 +19,13 @@ class Origami::SaleEditController < BaseOrigamiController
@newsaleitem.qty = saleitemObj.qty * -1
@newsaleitem.price = saleitemObj.price * -1
@newsaleitem.is_taxable = 1
- @newsaleitem.product_name = saleitemObj.product_name + " - void"
+ @newsaleitem.product_name = saleitemObj.product_name + ' - void'
@newsaleitem.save
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
+ ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
end
def item_foc
@@ -44,6 +45,7 @@ class Origami::SaleEditController < BaseOrigamiController
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
+ ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
end
# def item_edit
@@ -77,16 +79,19 @@ class Origami::SaleEditController < BaseOrigamiController
saleitemObj.unit_price = update_price
saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
# saleitemObj.remark = 'edit'
- if !saleitemObj.product_name.include? "updated"
- saleitemObj.product_name = saleitemObj.product_name + " - updated"
+
+ unless saleitemObj.product_name.include? 'updated'
+ saleitemObj.product_name = saleitemObj.product_name + ' - updated'
end
+
saleitemObj.save
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
- end
+ ProductCommission.edit_product_commission(saleitemObj)
+ end
# make cancel void item
def item_void_cancel
@@ -104,6 +109,7 @@ class Origami::SaleEditController < BaseOrigamiController
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
+ ProductCommission.remove_product_commission(saleitemObj)
end
# remove all void items
@@ -117,6 +123,7 @@ class Origami::SaleEditController < BaseOrigamiController
item.remark = nil
end
item.save
+ ProductCommission.remove_product_commission(item)
end
# re-calc tax
@@ -127,5 +134,8 @@ class Origami::SaleEditController < BaseOrigamiController
sale_id = params[:sale_id]
saleObj = Sale.find(sale_id)
saleObj.compute_without_void
+ saleObj.sale_items.each do |item|
+ ProductCommission.remove_product_commission(item)
+ end
end
end
diff --git a/app/models/product_commission.rb b/app/models/product_commission.rb
index 0e39f9f3..9b56e889 100644
--- a/app/models/product_commission.rb
+++ b/app/models/product_commission.rb
@@ -5,14 +5,67 @@ class ProductCommission < ApplicationRecord
belongs_to :sale_item, foreign_key: 'sale_item_id'
belongs_to :sale, foreign_key: 'sale_id'
+ def self.create_product_commission(newSaleItem, oldSaleItem)
+ old_product_commission = ProductCommission.find_by_sale_item_id(oldSaleItem.id)
+ return if old_product_commission.nil?
+ menu_item = MenuItem.find_by_item_code(newSaleItem.product_code)
+ return if menu_item.nil?
+ product_commission = ProductCommission.new
+ commission = Commission.where('product_code = ? AND is_active = ?', menu_item.id, true).take
+ product_commission.product_code = menu_item.id
+ product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type
+ unless commission.nil?
+ product_commission.commission_id = commission.id
+ if commission.commission_type == 'Percentage'
+ product_commission.price = newSaleItem.unit_price * (commission.amount / 100.0)
+ product_commission.amount = product_commission.price * newSaleItem.qty
+ elsif commission.commission_type == 'Net Amount'
+ product_commission.price = commission.amount
+ product_commission.amount = product_commission.price * newSaleItem.qty
+ end
+ end
+ unless old_product_commission.nil?
+ product_commission.commissioner_id = old_product_commission.commissioner_id
+ end
+ product_commission.qty = newSaleItem.qty
+ product_commission.sale_id = newSaleItem.sale_id
+ product_commission.sale_item_id = newSaleItem.sale_item_id
+ product_commission.save
+ end
+
+ def self.edit_product_commission(saleItemObj)
+ menu_item = MenuItem.find_by_item_code(saleItemObj.product_code)
+ commission = Commission.where('product_code = ? AND is_active = ?', menu_item.id, true).take
+ product_commission = ProductCommission.where('sale_item_id = ?', saleItemObj.id).take
+
+ return if commission.nil?
+ product_commission.qty = saleItemObj.qty
+ if commission.commission_type == 'Percentage'
+ product_commission.price = saleItemObj.unit_price * (commission.amount / 100.0)
+ product_commission.amount = product_commission.price * saleItemObj.qty
+ elsif commission.commission_type == 'Net Amount'
+ product_commission.price = commission.amount
+ product_commission.amount = product_commission.price * saleItemObj.qty
+ end
+ product_commission.save
+ puts 'Edit Product Commission Success'
+ end
+
+ def self.remove_product_commission(sale_item_id)
+ transaction = ProductCommission.find_by_sale_item_id(sale_item_id)
+ return if transaction.nil?
+ transaction.destroy
+ puts 'Remove Product Commission Success'
+ end
+
def self.get_transaction(from, to, commissioner)
- transaction = self.all
+ transaction = all
if !from.nil? && !to.nil?
transaction = transaction.where('updated_at between ? and ?', from, to)
end
if commissioner != 0
transaction = transaction.where(commissioner_id: commissioner)
end
- return transaction
+ transaction
end
end
diff --git a/app/models/promotion.rb b/app/models/promotion.rb
index dfab86e9..624818f1 100644
--- a/app/models/promotion.rb
+++ b/app/models/promotion.rb
@@ -28,8 +28,13 @@ class Promotion < ApplicationRecord
end
def self.combine_item(saleObj)
- order_id = saleObj.sale_orders[0].order_id
- itemList = OrderItem.where("order_id = ?", order_id).group(:item_instance_code).sum(:qty)
+ # order_id = saleObj.sale_orders[0].order_id
+ # itemList = OrderItem.where("order_id = ?", order_id).group(:item_instance_code).sum(:qty)
+ itemList = []
+ saleObj.sale_orders.each do |so|
+ itemList << OrderItem.where("order_id = ?",so.order_id).group(:item_instance_code).sum(:qty)
+ end
+ return itemList
end
def self.is_promo_day(promoList, day, orderitemList, sale_id)
@@ -46,13 +51,15 @@ class Promotion < ApplicationRecord
def self.find_promo_item(promo, orderitem, sale_id)
# item_code = OrderItem.find_by_item_instance_code(orderitem[0]).item_code
- if promo.original_product.to_s == orderitem[0]
- if promo.min_qty.to_i > orderitem[1].to_i
- return false
- else
- check_promo_type(promo,orderitem, sale_id)
- end
- end
+ orderitem.each do |odr_item|
+ if promo.original_product.to_s == odr_item[0]
+ if promo.min_qty.to_i > odr_item[1].to_i
+ return false
+ else
+ check_promo_type(promo,odr_item, sale_id)
+ end
+ end
+ end
end
def self.check_promo_type(promo, orderitem, sale_id)
@@ -126,7 +133,6 @@ class Promotion < ApplicationRecord
# AA - 10 # 3 # BB # orderList, #S34345
def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id)
puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s
- byebug
promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty
foc_qty = find_second_item_qty(sale_id, promo_product)
if (foc_qty < promotion_qty)
@@ -212,9 +218,11 @@ class Promotion < ApplicationRecord
saleObj = Sale.find_by_sale_id(sale_id)
itemList = combine_item(saleObj)
itemList.each do |item|
- if item[0] == promo_item
- return item[1]
- end
+ item.each do |i|
+ if i[0] == promo_item
+ return i[1]
+ end
+ end
end
return 0
end
diff --git a/app/views/origami/product_commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb
index b0bb5e63..d8d3dc8e 100644
--- a/app/views/origami/product_commissions/load_commissioners.html.erb
+++ b/app/views/origami/product_commissions/load_commissioners.html.erb
@@ -77,7 +77,7 @@
<%= sale_item.qty %>
|
- <%= sale_item.unit_price %>
+ <%= sale_item.price %>
|
<% product_commission = ProductCommission.find_by_sale_item_id(sale_item.id) %>
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 4715b00c..749a62fc 100644
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -29,6 +29,8 @@
| From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> |
+ | Sale |
+ Sale Item |
Commissioner Name |
Product Name |
Qty |
@@ -44,12 +46,10 @@
<% @transaction.each do |result| %>
- |
- <%= result.commissioner.name rescue '-' %>
- |
-
- <%= result.commission.menu_item.name rescue '-' %>
- |
+ <%= result.sale_id rescue '-' %> |
+ <%= result.sale_item_id rescue '-' %> |
+ <%= result.commissioner.name rescue '-' %> |
+ <%= result.commission.menu_item.name rescue '-' %> |
<%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %> |
<%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %> |
<%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %> |
@@ -61,7 +61,7 @@
<% end %>
- |
+ |
<%= sprintf("%.2f", total_qty) rescue '-' %> |
<%= sprintf("%.2f", total_price) rescue '-' %> |
<%= sprintf("%.2f", total_amount) rescue '-' %> |
diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb
index 2ec9c115..30422fd1 100644
--- a/app/views/settings/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -8,7 +8,7 @@
<%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
<%= f.input :amount %>
-
+
<%= link_to 'Back', settings_commissions_path, class: 'btn btn-success' %>
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index bea1f981..c832461d 100644
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -41,16 +41,16 @@
-
+
<%= f.input :promo_type,input_html: { class: "" },
@@ -166,13 +166,13 @@ $(document).ready(function(){
var form = document.getElementById("new_promotion");
- var inputs = form.getElementsByTagName("input");
+ var inputs = $("input");
var arr = [];
var count = 0;
var day = "[";
-
-$(".select").click(function() {
-
+
+$(".selectDay").click(function() {
+
// debugger;
day = "[";
for (var j = 8; j <=15; j += 1){
@@ -192,8 +192,8 @@ $(".select").click(function() {
}
document.getElementById("promotion_promo_day").value = '';
document.getElementById("promotion_promo_day").value = day;
- });
-
+ });
+
$("#promotion_original_product").select2();
$(".item_code_place").select2();
$(".item_code_place").on('change', function(event) {
diff --git a/dump.rdb b/dump.rdb
index 29aafb9a..7d7b359c 100644
Binary files a/dump.rdb and b/dump.rdb differ