git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflit

Browse Source
This commit is contained in:
Zin Lin Phyo
2017-06-27 14:04:29 +06:30
parent 8d8f7b9093 def8ce34c2
commit 1c65a38b70
16 changed files with 306 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
.idea/workspace.xml generated
View File

@@ -3,16 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment=""> <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/void_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/void_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/home/index.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/home/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/home/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/orders/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/orders/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/payments/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/payments/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/sales/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/sales/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb" />
</list> </list>
<ignored path="$PROJECT_DIR$/.bundle/" /> <ignored path="$PROJECT_DIR$/.bundle/" />
<ignored path="$PROJECT_DIR$/components/" /> <ignored path="$PROJECT_DIR$/components/" />
@@ -85,7 +75,45 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="420">
<caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" /> <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
<folding /> <folding>
<marker date="1498539948000" expanded="true" signature="3450:4239" ph="do ... end" />
<marker date="1498539948000" expanded="true" signature="3598:4131" ph="&lt;%...%&gt;" />
<marker date="1498539948000" expanded="true" signature="3714:4114" ph="if ... end" />
<marker date="1498539948000" expanded="true" signature="4005:4027" ph="if ... end" />
<marker date="1498539948000" expanded="true" signature="4395:6842" ph="..." />
<marker date="1498539948000" expanded="true" signature="4419:6833" ph="..." />
<marker date="1498539948000" expanded="true" signature="4454:4539" ph="..." />
<marker date="1498539948000" expanded="true" signature="4571:6821" ph="..." />
<marker date="1498539948000" expanded="true" signature="4609:5000" ph="..." />
<marker date="1498539948000" expanded="true" signature="4661:4756" ph="..." />
<marker date="1498539948000" expanded="true" signature="4678:4738" ph="..." />
<marker date="1498539948000" expanded="true" signature="4713:4734" ph="..." />
<marker date="1498539948000" expanded="true" signature="4819:4984" ph="..." />
<marker date="1498539948000" expanded="true" signature="5059:5210" ph="..." />
<marker date="1498539948000" expanded="true" signature="5111:5193" ph="..." />
<marker date="1498539948000" expanded="true" signature="5243:6180" ph="..." />
<marker date="1498539948000" expanded="true" signature="5313:6164" ph="..." />
<marker date="1498539948000" expanded="true" signature="5334:5545" ph="..." />
<marker date="1498539948000" expanded="true" signature="5354:5523" ph="..." />
<marker date="1498539948000" expanded="true" signature="5566:6144" ph="..." />
<marker date="1498539948000" expanded="true" signature="5583:5749" ph="&lt;%...%&gt;" />
<marker date="1498539948000" expanded="true" signature="5817:6041" ph="..." />
<marker date="1498539948000" expanded="true" signature="6058:6123" ph="&lt;%...%&gt;" />
<marker date="1498539948000" expanded="true" signature="6215:6807" ph="..." />
<marker date="1498539948000" expanded="true" signature="6284:6791" ph="..." />
<marker date="1498539948000" expanded="true" signature="6302:6491" ph="..." />
<marker date="1498539948000" expanded="true" signature="6509:6725" ph="..." />
<marker date="1498539948000" expanded="true" signature="6908:7237" ph="..." />
<marker date="1498539948000" expanded="true" signature="6999:7127" ph="if ... end" />
<marker date="1498539948000" expanded="true" signature="7253:8136" ph="..." />
<marker date="1498539948000" expanded="true" signature="7283:7870" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7322:7434" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7471:7574" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7612:7723" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7761:7867" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7905:8012" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="8047:8088" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -93,8 +121,8 @@
<file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true"> <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb"> <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550"> <state relative-caret-position="249">
<caret line="191" column="7" lean-forward="true" selection-start-line="191" selection-start-column="7" selection-end-line="191" selection-end-column="7" /> <caret line="139" column="30" lean-forward="true" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -879,12 +907,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1498458293643</updated> <updated>1498458293643</updated>
<workItem from="1498458295318" duration="2552000" /> <workItem from="1498458295318" duration="2552000" />
<workItem from="1498465879846" duration="18166000" /> <workItem from="1498465879846" duration="18792000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="20718000" /> <option name="totallyTimeSpent" value="21344000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="22" width="1440" height="833" extended-state="6" /> <frame x="0" y="22" width="1440" height="833" extended-state="6" />
@@ -1180,14 +1208,52 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="420">
<caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" /> <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
<folding /> <folding>
<marker date="1498539948000" expanded="true" signature="3450:4239" ph="do ... end" />
<marker date="1498539948000" expanded="true" signature="3598:4131" ph="&lt;%...%&gt;" />
<marker date="1498539948000" expanded="true" signature="3714:4114" ph="if ... end" />
<marker date="1498539948000" expanded="true" signature="4005:4027" ph="if ... end" />
<marker date="1498539948000" expanded="true" signature="4395:6842" ph="..." />
<marker date="1498539948000" expanded="true" signature="4419:6833" ph="..." />
<marker date="1498539948000" expanded="true" signature="4454:4539" ph="..." />
<marker date="1498539948000" expanded="true" signature="4571:6821" ph="..." />
<marker date="1498539948000" expanded="true" signature="4609:5000" ph="..." />
<marker date="1498539948000" expanded="true" signature="4661:4756" ph="..." />
<marker date="1498539948000" expanded="true" signature="4678:4738" ph="..." />
<marker date="1498539948000" expanded="true" signature="4713:4734" ph="..." />
<marker date="1498539948000" expanded="true" signature="4819:4984" ph="..." />
<marker date="1498539948000" expanded="true" signature="5059:5210" ph="..." />
<marker date="1498539948000" expanded="true" signature="5111:5193" ph="..." />
<marker date="1498539948000" expanded="true" signature="5243:6180" ph="..." />
<marker date="1498539948000" expanded="true" signature="5313:6164" ph="..." />
<marker date="1498539948000" expanded="true" signature="5334:5545" ph="..." />
<marker date="1498539948000" expanded="true" signature="5354:5523" ph="..." />
<marker date="1498539948000" expanded="true" signature="5566:6144" ph="..." />
<marker date="1498539948000" expanded="true" signature="5583:5749" ph="&lt;%...%&gt;" />
<marker date="1498539948000" expanded="true" signature="5817:6041" ph="..." />
<marker date="1498539948000" expanded="true" signature="6058:6123" ph="&lt;%...%&gt;" />
<marker date="1498539948000" expanded="true" signature="6215:6807" ph="..." />
<marker date="1498539948000" expanded="true" signature="6284:6791" ph="..." />
<marker date="1498539948000" expanded="true" signature="6302:6491" ph="..." />
<marker date="1498539948000" expanded="true" signature="6509:6725" ph="..." />
<marker date="1498539948000" expanded="true" signature="6908:7237" ph="..." />
<marker date="1498539948000" expanded="true" signature="6999:7127" ph="if ... end" />
<marker date="1498539948000" expanded="true" signature="7253:8136" ph="..." />
<marker date="1498539948000" expanded="true" signature="7283:7870" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7322:7434" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7471:7574" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7612:7723" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7761:7867" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="7905:8012" ph="{...}" />
<marker date="1498539948000" expanded="true" signature="8047:8088" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb"> <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550"> <state relative-caret-position="249">
<caret line="191" column="7" lean-forward="true" selection-start-line="191" selection-start-column="7" selection-end-line="191" selection-end-column="7" /> <caret line="139" column="30" lean-forward="true" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
<folding /> <folding />
</state> </state>
</provider> </provider>

2
app/controllers/oqs/home_controller.rb
View File

@@ -117,7 +117,7 @@ class Oqs::HomeController < BaseOqsController
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
left join bookings as bk on bk.booking_id = bo.booking_id left join bookings as bk on bk.booking_id = bo.booking_id
left join dining_facilities as df on df.id = bk.dining_facility_id") left join dining_facilities as df on df.id = bk.dining_facility_id")
.where("assigned_order_items.delivery_status = #{status}") .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0")
.group("assigned_order_items.assigned_order_item_id") .group("assigned_order_items.assigned_order_item_id")
end end
end end

9
app/models/order.rb
View File

@@ -82,6 +82,15 @@ class Order < ApplicationRecord
set_order_items set_order_items
end end
# not insert with price 0
# puts item[:price]
# puts item
# if(item[:price] != 0 )
# OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id],
# item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
# self.employee_name)
# end
OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id], OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id],
item[:quantity],menu_item[:price], item[:options], set_order_items, self.id, item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
self.employee_name) self.employee_name)

8
app/models/order_queue_station.rb
View File

@@ -36,9 +36,11 @@ class OrderQueueStation < ApplicationRecord
# #Same Order_items can appear in two location. # #Same Order_items can appear in two location.
# AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs)
# else # else
AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) if (order_item.price != 0)
oqs_order_items.push(order_item) AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs)
oqs_order_items.push(order_item)
end
# end # end
end end
end end

77
app/models/printer/order_queue_printer.rb
View File

@@ -6,19 +6,23 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
#Print #Print
order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)
filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf"
pdf = OrderItemPdf.new(order_item[0], print_status, options)
pdf.render_file filename
if oqs.print_copy # check for item not to show
self.print(filename, oqs.printer_name) if order_item[0].price != 0
pdf = OrderItemPdf.new(order_item[0], print_status, options)
pdf.render_file filename
#For print copy if oqs.print_copy
pdf.render_file filename.gsub(".","-copy.") self.print(filename, oqs.printer_name)
self.print(filename.gsub(".","-copy."), oqs.printer_name)
else #For print copy
self.print(filename, oqs.printer_name) pdf.render_file filename.gsub(".","-copy.")
end self.print(filename.gsub(".","-copy."), oqs.printer_name)
else
self.print(filename, oqs.printer_name)
end
end
end end
# Query for per order # Query for per order
@@ -33,14 +37,18 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
filename = "tmp/order_item_#{odi.item_name}" + ".pdf" filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
# For Item Options # For Item Options
options = odi.options == "[]"? "" : odi.options options = odi.options == "[]"? "" : odi.options
pdf = OrderItemPdf.new(odi, print_status, options)
# pdf.render_file "tmp/order_item.pdf" # check for item not to show
pdf.render_file filename if odi.price != 0 || odi.price != 10
if oqs.print_copy pdf = OrderItemPdf.new(odi, print_status, options)
self.print(filename, oqs.printer_name) # pdf.render_file "tmp/order_item.pdf"
self.print(filename.gsub(".","-copy."), oqs.printer_name) pdf.render_file filename
else if oqs.print_copy
self.print(filename, oqs.printer_name) self.print(filename, oqs.printer_name)
self.print(filename.gsub(".","-copy."), oqs.printer_name)
else
self.print(filename, oqs.printer_name)
end
end end
end end
# For Print Order Summary # For Print Order Summary
@@ -69,19 +77,22 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
filename = "tmp/order_item_#{odi.item_name}" + ".pdf" filename = "tmp/order_item_#{odi.item_name}" + ".pdf"
# For Item Options # For Item Options
options = odi.options == "[]"? "" : odi.options options = odi.options == "[]"? "" : odi.options
pdf = OrderItemPdf.new(odi, print_status, options)
pdf.render_file filename
if oqs.print_copy # check for item not to show
self.print(filename, oqs.printer_name) if odi.price != 0
pdf = OrderItemPdf.new(odi, print_status, options)
pdf.render_file filename
#For print copy if oqs.print_copy
pdf.render_file filename.gsub(".","-copy.") self.print(filename, oqs.printer_name)
self.print(filename.gsub(".","-copy."), oqs.printer_name)
else #For print copy
self.print(filename, oqs.printer_name) pdf.render_file filename.gsub(".","-copy.")
end self.print(filename.gsub(".","-copy."), oqs.printer_name)
else
self.print(filename, oqs.printer_name)
end
end
end end
# For Print Order Summary # For Print Order Summary
else else
@@ -109,7 +120,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
left join bookings AS b ON b.booking_id = bo.booking_id left join bookings AS b ON b.booking_id = bo.booking_id
left join dining_facilities AS df ON df.id = b.dining_facility_id left join dining_facilities AS df ON df.id = b.dining_facility_id
left join customers as cus ON cus.customer_id = orders.customer_id") left join customers as cus ON cus.customer_id = orders.customer_id")
.where("order_items.item_code = '#{ id }'") .where("order_items.item_code = '#{ id }' AND order_items.price != 0")
.group("order_items.item_code") .group("order_items.item_code")
elsif type == "order_summary" elsif type == "order_summary"
OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining") OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining")
@@ -118,7 +129,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
left join bookings AS b ON b.booking_id = bo.booking_id left join bookings AS b ON b.booking_id = bo.booking_id
left join dining_facilities AS df ON df.id = b.dining_facility_id left join dining_facilities AS df ON df.id = b.dining_facility_id
left join customers as cus ON cus.customer_id = orders.customer_id") left join customers as cus ON cus.customer_id = orders.customer_id")
.where("orders.order_id = '#{ id }'") .where("orders.order_id = '#{ id }' AND order_items.price != 0")
.group("order_items.order_items_id") .group("order_items.order_items_id")
else else
# order summary for booking # order summary for booking
@@ -128,7 +139,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
left join bookings AS b ON b.booking_id = bo.booking_id left join bookings AS b ON b.booking_id = bo.booking_id
left join dining_facilities AS df ON df.id = b.dining_facility_id left join dining_facilities AS df ON df.id = b.dining_facility_id
left join customers as cus ON cus.customer_id = orders.customer_id") left join customers as cus ON cus.customer_id = orders.customer_id")
.where("b.booking_id = '#{ id }'") .where("b.booking_id = '#{ id }' AND order_items.price != 0")
end end
end end

12
app/models/sale_payment.rb
View File

@@ -97,7 +97,7 @@ class SalePayment < ApplicationRecord
sale_data.sale_payments.each do |sale_payment| sale_data.sale_payments.each do |sale_payment|
others = others + sale_payment.payment_amount others = others + sale_payment.payment_amount
end end
redeem_prices = sale_data.grand_total -others redeem_prices = sale_data.grand_total - others
# Control for Paypar Cloud # Control for Paypar Cloud
begin begin
response = HTTParty.post(url, response = HTTParty.post(url,
@@ -232,11 +232,19 @@ class SalePayment < ApplicationRecord
self.sale.amount_changed = self.sale.amount_received.to_f - self.sale.grand_total.to_f self.sale.amount_changed = self.sale.amount_received.to_f - self.sale.grand_total.to_f
all_received_amount = 0.0 all_received_amount = 0.0
sObj = Sale.find(self.sale_id) sObj = Sale.find(self.sale_id)
is_credit = 0
sObj.sale_payments.each do |spay| sObj.sale_payments.each do |spay|
all_received_amount += spay.payment_amount.to_f all_received_amount += spay.payment_amount.to_f
if spay.payment_method == "creditnote"
is_credit = 1
end
end end
if (self.sale.grand_total <= all_received_amount) if (self.sale.grand_total <= all_received_amount)
self.sale.payment_status = "paid" if is_credit == 0
self.sale.payment_status = "paid"
else
self.sale.payment_status = "outstanding"
end
self.sale.sale_status = "completed" self.sale.sale_status = "completed"
self.sale.save! self.sale.save!
table_update_status(sObj) table_update_status(sObj)

2
app/pdf/order_item_pdf.rb
View File

@@ -60,7 +60,7 @@ class OrderItemPdf < Prawn::Document
def order_items(order_item, options) def order_items(order_item, options)
y_position = cursor y_position = cursor
#Add Order Item #Add Order Item
add_order_items(order_item, options) add_order_items(order_item, options)
dash(1, :space => 1, :phase => 1) dash(1, :space => 1, :phase => 1)

54
app/pdf/order_summary_pdf.rb
View File

@@ -86,38 +86,38 @@ class OrderSummaryPdf < Prawn::Document
move_down 5 move_down 5
order_item.each do|odi| order_item.each do|odi|
y_position = cursor # check for item not to show
if odi.price != 0
# pad_top(15) {
# text_box "#{odi.item_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
# text_box "#{odi.qty}", :at =>[self.item_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
# }
bounding_box([0,y_position], :width => self.item_width) do
text "#{odi.item_name}", :size => self.item_font_size,:align => :left
end
bounding_box([self.item_width,y_position], :width => self.qty_width) do
text "#{odi.qty}", :size => self.item_font_size,:align => :left
end
move_down 5
# add option
options = odi.options == "[]"? "" : odi.options
if options != ""
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
text "#{options}", :size => self.item_font_size,:align => :left bounding_box([0,y_position], :width => self.item_width) do
text "#{odi.item_name}", :size => self.item_font_size,:align => :left
end
bounding_box([self.item_width,y_position], :width => self.qty_width) do
text "#{odi.qty}", :size => self.item_font_size,:align => :left
end end
move_down 5 move_down 5
# add option
options = odi.options == "[]"? "" : odi.options
if options != ""
y_position = cursor
bounding_box([0,y_position], :width => self.item_width) do
text "#{options}", :size => self.item_font_size,:align => :left
end
move_down 5
end
move_down 5
dash(1, :space => 1, :phase => 1)
stroke_horizontal_line 0, (self.page_width - self.margin)
move_down 5
end end
dash(1, :space => 1, :phase => 1)
stroke_horizontal_line 0, (self.page_width - self.margin)
move_down 5
end end
end end
end end

31
app/pdf/receipt_bill_pdf.rb
View File

@@ -2,7 +2,7 @@ class ReceiptBillPdf < Prawn::Document
attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details) def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details)
self.page_width = 210 self.page_width = 210
self.page_height = 2500 self.page_height = 7000
self.margin = 5 self.margin = 5
self.price_width = 40 self.price_width = 40
self.qty_width = 20 self.qty_width = 20
@@ -119,22 +119,25 @@ class ReceiptBillPdf < Prawn::Document
move_down 5 move_down 5
sub_total = 0.0 sub_total = 0.0
sale_items.each do |item| sale_items.each do |item|
sub_total += (item.qty*item.unit_price) # check for item not to show
qty = item.qty if item.price != 0
total_price = item.qty*item.unit_price sub_total += (item.qty*item.unit_price)
price = item.unit_price qty = item.qty
product_name = item.product_name total_price = item.qty*item.unit_price
price = item.unit_price
product_name = item.product_name
y_position = cursor y_position = cursor
pad_top(15) { pad_top(15) {
text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
text_box "#{price}", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix text_box "#{price}", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
text_box "#{qty}", :at =>[item_name_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix text_box "#{qty}", :at =>[item_name_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
text_box "#{total_price}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix text_box "#{total_price}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
} }
move_down 1 move_down 1
end
end end
stroke_horizontal_rule stroke_horizontal_rule

18
app/views/home/dashboard.html.erb
View File

@@ -1,7 +1,7 @@
<div class="row"> <div class="row">
<div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3"> <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
<%= current_login_employee.name %>
<% if current_login_employee.role = "admin" %> <% if current_login_employee.role = "admin" %>
<% elsif current_login_employee.role = "cashier" %> <% elsif current_login_employee.role = "cashier" %>
<%= link_to "Cashier Station", origami_path %> <%= link_to "Cashier Station", origami_path %>
@@ -13,7 +13,23 @@
<%= link_to "Cashier Station", oishi_path %> <%= link_to "Cashier Station", oishi_path %>
<% end %> <% end %>
<% shop = Shop.first %>
<!-- -->
<div class="card">
<div class="page-header" style="width:100%;text-align:center;background-color:#ddd;">
<h4 style="color : #ef404a;font-weight:bold;font-style:italic;"><%= shop.name %></h4>
</div>
<div class="card-block">
<%= shop.address %>
</div>
<div class="card-block">
<%= shop.phone_no %>
</div>
</div>
</div> </div>
</div> </div>

14
app/views/oqs/home/index.html.erb
View File

@@ -34,7 +34,8 @@
<div class="tab-pane active" id="completed" role="tabpanel"> <div class="tab-pane active" id="completed" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% <%
@queue_completed_item.each do |qid| @queue_completed_item.each do |qid|
if qid.price != 0
%> %>
<div class="card queue_station"> <div class="card queue_station">
<div class="card-block"> <div class="card-block">
@@ -69,7 +70,8 @@
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p> <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
</div> </div>
</div> </div>
<% <%
end
end end
%> %>
</div> </div>
@@ -85,8 +87,9 @@
<!--- Order Items --> <!--- Order Items -->
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% <%
@queue_items_details.each do |qid| @queue_items_details.each do |qid|
if qid.station_name == qsi[:station_name] if qid.price != 0
if qid.station_name == qsi[:station_name]
%> %>
<div class="card queue_station"> <div class="card queue_station">
<div class="card-block"> <div class="card-block">
@@ -121,7 +124,8 @@
<button id=<%= 'assigned_queue_' + qid.assigned_order_item_id.to_s %> class="btn btn-primary order-item order-complete">COMPLETE</button> <button id=<%= 'assigned_queue_' + qid.assigned_order_item_id.to_s %> class="btn btn-primary order-item order-complete">COMPLETE</button>
</div> </div>
</div> </div>
<% <%
end
end end
end end
%> %>

12
app/views/origami/discounts/index.html.erb
View File

@@ -29,7 +29,10 @@
<tbody> <tbody>
<% sub_total = 0 %> <% sub_total = 0 %>
<% @sale_data.sale_items.each do |sale_item| %> <% @sale_data.sale_items.each do |sale_item| %>
<% sub_total += sale_item.qty*sale_item.unit_price%> <%
sub_total += sale_item.qty*sale_item.unit_price
unless sale_item.price == 0
%>
<tr class="item-row" id=<%= sale_item.sale_item_id %> > <tr class="item-row" id=<%= sale_item.sale_item_id %> >
<td style="width:60%; text-align:left"> <td style="width:60%; text-align:left">
<span id="item-account-type" class="hidden"><%=sale_item.account_id%></span> <span id="item-account-type" class="hidden"><%=sale_item.account_id%></span>
@@ -42,7 +45,10 @@
<span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span> <span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span>
</td> </td>
</tr> </tr>
<%end %> <%
end
end
%>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -166,7 +172,7 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<button id="net" class="btn btn-warning fluid action-btn">Net</button> <button id="net" class="btn btn-warning fluid action-btn">Nett</button>
<button id="percentage" class="btn btn-primary fluid action-btn">Percentage</button> <button id="percentage" class="btn btn-primary fluid action-btn">Percentage</button>
<button id="remove-item" class="btn btn-default fluid action-btn">Remove</button> <button id="remove-item" class="btn btn-default fluid action-btn">Remove</button>
</div> </div>

32
app/views/origami/home/show.html.erb
View File

@@ -139,7 +139,7 @@
<%if @customer %> <%if @customer %>
<p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p> <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
<p>Customer : <%= @customer.name rescue "" %></p> <p>Customer : <%= @customer.name rescue "" %></p>
<%end%> <%end%>
</div> </div>
</div> </div>
<div class="card-text"> <div class="card-text">
@@ -250,8 +250,10 @@
</table> </table>
<button class='btn btn-primary' id='add_invoice'> Add to existing invoice </button> <button class='btn btn-primary' id='add_invoice'> Add to existing invoice </button>
<% end %> <% end %>
<% if @sale_array.size > 1 %>
<br><br> <br><br>
Pending Payment Pending Payment
<% end %>
<% @sale_array.each do |sale| <% @sale_array.each do |sale|
if @sale_array.size > 1 if @sale_array.size > 1
unless sale.receipt_no == @sale_array[0].receipt_no unless sale.receipt_no == @sale_array[0].receipt_no
@@ -474,20 +476,20 @@ $('#edit').on('click',function(){
var sale_id = "<%= @obj_sale.sale_id rescue "" %>" var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit"; window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit";
}) })
$('#void').on('click',function () { $('#void').on('click',function () {
var sure = confirm("Are you sure want to Void"); var sure = confirm("Are you sure want to Void");
if (sure == true) { if (sure == true) {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
var ajax_url = "/origami/sale/" + sale_id + '/void'; var ajax_url = "/origami/sale/" + sale_id + '/void';
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: ajax_url, url: ajax_url,
success: function () { success: function () {
window.location.href = '/origami/'; window.location.href = '/origami/';
} }
}) })
} else { } else {
} }

68
app/views/origami/rooms/show.html.erb
View File

@@ -155,7 +155,7 @@
sub_total = 0 sub_total = 0
if @status == "sale" if @status == "sale"
@obj.sale_items.each do |sale_item| @obj.sale_items.each do |sale_item|
sub_total = sub_total + sale_item.price sub_total = sub_total + sale_item.price
%> %>
<input type="hidden" id="sale_id" value="<%= @obj.sale_id %>"> <input type="hidden" id="sale_id" value="<%= @obj.sale_id %>">
<% unless sale_item.price == 0 %> <% unless sale_item.price == 0 %>
@@ -213,32 +213,52 @@
</table> </table>
</div> </div>
<br> <br>
<%
if @status_sale == 'sale'
unless @order_items.nil?
%>
Pending New Order
<table class="table table-striped">
<%
count = 0
@order_items.each do |order_item |
count += 1
%>
<% <tr>
if @status == 'sale' <td><%= count %>
unless @order_items.nil? <td class='item-name'><%= order_item.item_name %></td>
%> <td class='item-attr'><%= order_item.qty %></td>
Added New Order <td class='item-attr'><%= order_item.qty*order_item.price %></td>
<table class="table table-striped"> </tr>
<%
@order_items.each do |order_item | <%
end
%> %>
</table>
<button class='btn btn-primary' id='add_invoice'> Add to existing invoice </button>
<% end %>
<% if @sale_array.size > 1 %>
<br><br>
Pending Payment
<% end %>
<% @sale_array.each do |sale|
if @sale_array.size > 1
unless sale.receipt_no == @sale_array[0].receipt_no
%>
<tr> <table class="table table-striped">
<td class='item-name'><%= order_item.item_name %></td> <tr>
<td class='item-attr'><%= order_item.qty %></td> <td>Receipt No - <%= sale.receipt_no %></td>
<td class='item-attr'><%= order_item.qty*order_item.price %></td> <td><button class='btn btn-sm btn-primary invoicedetails' id="<%= sale.sale_id %>">Show Detail </button></td>
</tr> </tr>
</table>
<% <%
end end
%> end
</table> end
<button class='btn btn-primary'> Add to existing invoice </button> end
<% %>
end
end
%>
</div> </div>
</div> </div>

BIN
dump.rdb
View File

Binary file not shown.

24
lib/tasks/menu_import.rake
View File

@@ -30,7 +30,7 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base"
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"VIP Room Individual Pot",item_instance_code:"II0031", menu_item: menu_category1_menu_item2, price:10.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"VIP Room Individual Pot",item_instance_code:"II0031", menu_item: menu_category1_menu_item2, price:10.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0053", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0053", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0063", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0063", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item2, price:8000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0083", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0083", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0093", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0093", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0103", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0103", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
@@ -39,8 +39,8 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base"
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Quart Pot",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:10.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Quart Pot",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:10.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0054", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0054", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0064", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0064", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item3, price:8000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item3, price:8000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0094", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0094", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0104", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0104", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}])
@@ -48,7 +48,7 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base"
# Assorted Platter # Assorted Platter
menu_category2 = MenuCategory.create({menu: menu, code:"C002", name: "Specialty Assorted Platter", alt_name: "Assorted Platter", order_by: 2, created_by: "SYSTEM DEFAULT"}) menu_category2 = MenuCategory.create({menu: menu, code:"C002", name: "Specialty Assorted Platter", alt_name: "Assorted Platter", order_by: 2, created_by: "SYSTEM DEFAULT"})
# Pork Platter # Pork Platter
menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01004", name: "Pork Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01048", name: "Pork Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Platter",item_instance_code:"II0111", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Platter",item_instance_code:"II0111", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false}])
# Beef Platter # Beef Platter
menu_category1_menu_item4 = SimpleMenuItem.create({item_code:"01005", name: "Beef Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_category1_menu_item4 = SimpleMenuItem.create({item_code:"01005", name: "Beef Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food })
@@ -462,7 +462,7 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1122", menu_item: menu_category1_menu_item105, price:1200.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1122", menu_item: menu_category1_menu_item105, price:1200.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1121", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1121", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}])
# Bamboo Shoot # Bamboo Shoot
menu_category1_menu_item105 = SimpleMenuItem.create({item_code:"01106", name: "Kangkung", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_category1_menu_item105 = SimpleMenuItem.create({item_code:"01112", name: "Bamboo Shoot", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1132", menu_item: menu_category1_menu_item105, price:1200.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1132", menu_item: menu_category1_menu_item105, price:1200.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1131", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1131", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}])
# Others # Others
@@ -566,17 +566,17 @@ menu_category19 = MenuCategory.create({menu: menu, code:"C0018", name: "Beer", a
menu_category1_menu_item132 = SimpleMenuItem.create({item_code:"01133", name: "Myanmar Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_category1_menu_item132 = SimpleMenuItem.create({item_code:"01133", name: "Myanmar Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1392", menu_item: menu_category1_menu_item132, price:1500.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1392", menu_item: menu_category1_menu_item132, price:1500.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1391", menu_item: menu_category1_menu_item132, price:3000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1391", menu_item: menu_category1_menu_item132, price:3000.00, is_on_promotion:false}])
# Tiger Beer # # Tiger Beer
menu_category1_menu_item133 = SimpleMenuItem.create({item_code:"01134", name: "Tiger Beer ", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) # menu_category1_menu_item133 = SimpleMenuItem.create({item_code:"01134", name: "Tiger Beer ", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1402", menu_item: menu_category1_menu_item133, price:1500.00, is_on_promotion:false}]) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1402", menu_item: menu_category1_menu_item133, price:1500.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1401", menu_item: menu_category1_menu_item133, price:3000.00, is_on_promotion:false}]) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1401", menu_item: menu_category1_menu_item133, price:3000.00, is_on_promotion:false}])
# Heineken Beer # Heineken Beer
menu_category1_menu_item134 = SimpleMenuItem.create({item_code:"01135", name: "Heineken Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_category1_menu_item134 = SimpleMenuItem.create({item_code:"01135", name: "Heineken Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1412", menu_item: menu_category1_menu_item134, price:1800.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1402", menu_item: menu_category1_menu_item134, price:1800.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1411", menu_item: menu_category1_menu_item134, price:3600.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1401", menu_item: menu_category1_menu_item134, price:3600.00, is_on_promotion:false}])
# Tsing Tao Beer # Tsing Tao Beer
menu_category1_menu_item135 = SimpleMenuItem.create({item_code:"01136", name: "Tsing Tao Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_category1_menu_item135 = SimpleMenuItem.create({item_code:"01136", name: "Tsing Tao Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1421", menu_item: menu_category1_menu_item135, price:2800.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II141", menu_item: menu_category1_menu_item135, price:2800.00, is_on_promotion:false}])
# ABC Stout # ABC Stout
menu_category1_menu_item136 = SimpleMenuItem.create({item_code:"01137", name: "ABC Stout ", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) menu_category1_menu_item136 = SimpleMenuItem.create({item_code:"01137", name: "ABC Stout ", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1432", menu_item: menu_category1_menu_item136, price:2000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1432", menu_item: menu_category1_menu_item136, price:2000.00, is_on_promotion:false}])