From bd94e808d4cdcf3e44297d082cca3c23973bc38b Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 13:24:37 +0630 Subject: [PATCH 01/10] print format --- app/controllers/api/bill_controller.rb | 4 +- app/models/order.rb | 6 +-- app/pdf/receipt_bill_pdf.rb | 52 ++++++++++++------------- dump.rdb | Bin 18787 -> 18800 bytes 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index a01cc717..6b1fb225 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -12,14 +12,14 @@ class Api::BillController < Api::ApiController if booking if booking.sale_id.nil? @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee) else @status = true end end elsif (params[:order_id]) @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) + @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee) end end diff --git a/app/models/order.rb b/app/models/order.rb index 83eb9418..a53ba3cf 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -231,7 +231,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true) - .group("bookings.booking_id,orders.status,sales.receipt_no,sales.sale_status,orders.order_id,sales.customer_id,sales.sale_id,dining_facilities.name") + .group("bookings.booking_id") # For PG # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id @@ -246,7 +246,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("sales.sale_status='completed'") - .group("sales.sale_id,orders.status,orders.order_id,bookings.booking_id,dining_facilities.name") + .group("sales.sale_id") # For PG #bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id end @@ -262,7 +262,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,orders.order_id,sales.customer_id,sales.sale_status,orders.customer_id,sales.sale_id,dining_facilities.name") + .group("bookings.booking_id") # For PG # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index c766b8cc..71562277 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,16 +1,16 @@ 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 def initialize(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total, member_info = nil) - self.page_width = 250 - self.page_height = 1450 - self.margin = 10 - self.price_width = 40 + self.page_width = 210 + self.page_height = 2500 + self.margin = 5 + self.price_width = 35 self.qty_width = 20 - self.total_width = 40 - self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)+(self.margin*4)) + self.total_width = 35 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) self.item_height = 15 - self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=80 + self.item_description_width = (self.page_width-20) / 2 + self.label_width = 100 # @item_width = self.page_width.to_i / 2 # @qty_width = @item_width.to_i / 3 @@ -22,10 +22,10 @@ class ReceiptBillPdf < Prawn::Document # font "public/fonts/#{font_name}".to_s + ".ttf".to_s # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 11 - self.item_font_size = 9 + self.header_font_size = 10 + self.item_font_size = 8 - header( printer_settings.printer_name, printer_settings.name) + header( "Beauty In the Pot", printer_settings.name) stroke_horizontal_rule @@ -92,8 +92,8 @@ class ReceiptBillPdf < Prawn::Document # @item_width.to_i + @half_qty.to_i text_box "Items", :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 "Qty", :at =>[(self.item_width+self.price_width),y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "Total", :at =>[(self.item_width+self.price_width+2),y_position], :width => self.total_width+2, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "Qty", :at =>[(self.item_width+self.price_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", :at =>[(self.item_width+self.price_width),y_position], :width => self.total_width+5, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } @@ -121,9 +121,9 @@ class ReceiptBillPdf < Prawn::Document pad_top(15) { text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :overflow => :shrink_to_fix, :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 "#{qty.to_i}", :at =>[item_name_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{total_price}", :at =>[(item_name_width+2),y_position], :width =>self.total_width+2, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{price.to_i}", :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.to_i}", :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.to_i}", :at =>[(item_name_width),y_position], :width =>self.total_width+5, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } move_down 3 end @@ -132,10 +132,10 @@ class ReceiptBillPdf < Prawn::Document move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>item_name_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Sub Total", :size => self.item_font_size,:align => :left end - bounding_box([item_name_width,y_position], :width =>self.total_width) do + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{ sub_total }" , :size => self.item_font_size,:align => :right end @@ -145,10 +145,10 @@ class ReceiptBillPdf < Prawn::Document move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>(item_name_width), :height => self.item_height) do + bounding_box([0,y_position], :width => self.item_description_width, :height => self.item_height) do text "Food/Beverage Total", :size => self.item_font_size,:align => :left end - bounding_box([item_name_width,y_position], :width =>self.total_width) do + bounding_box([self.item_description_width,y_position], :width => self.label_width) do text "#{ food_beverage_total }" , :size => self.item_font_size,:align => :right end end @@ -158,30 +158,30 @@ class ReceiptBillPdf < Prawn::Document move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>(item_name_width+self.price_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Discount", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width),y_position], :width =>self.total_width) do + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "( " +"#{sale_data.total_discount}" +" )" , :size => self.item_font_size,:align => :right end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>(item_name_width+self.price_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Total Tax", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width),y_position], :width =>self.total_width) do + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right end move_down 5 y_position = cursor move_down 5 - bounding_box([0,y_position], :width =>(item_name_width+self.price_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Grand Total", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width),y_position], :width =>self.total_width) do + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{sale_data.grand_total}" , :size => self.item_font_size,:align => :right end move_down 5 diff --git a/dump.rdb b/dump.rdb index c1a940eb5a86063e47c769946f40c57019cc2bca..63a4647b0a10a4c97d4109a8cddff7a04d5b4731 100644 GIT binary patch delta 1424 zcmYk6TWnNC9LCS=X?IJl?e;<>t>QG=prK6Xekp9TyT+0}c)?%{k@O!kk|vZFc`=;wXtM2Ap@1)qHcBX6(8Tzl0VOd(yv*5dw|$&BIp6%h@B7XC zlmQPi;2hpDjnao6R~#SjKe}hQe|RB&x!(KN`@0s{=ewRc-_z}j&!^94|7tPFv*-|w$9)(RY#Fb=%*rEEvrc6_bNl6thq)Mu(XoQQBsOA)LO_kJ6 zbT$2k8@1DZ8A%3TRgM5~Y-4G!RNZKLT3|^uL4-+42!*hGY;1I_XSn$tU_nbmK<`^?0SrgfXQMl?FcYggvltv=z>!Kry}` zsSPIIZd1*J**MfLS~wNp}*VZ?>|s+m*jPI$9r#)V>L9+veS89hFd zTx_mOMMCYi>|9h5p_JYjQVEx0xMhUdl)kg)R+SJKBh47YR5{r`X9M#MNw~PB?I6On zhAZBNCZ$3m&9$MD1yAaK@%`1}$P46JVPxiFL56T?L_ym=rq!)m6{FO#LN~isj3Gl6 zr&{GwKcsssVN>>^SPy^^B@j_m6T%#rhxURizE+x-7}}ydU#^+E2c=|n2!(c3D4k2) zOCJn*58i9+_x(GCnNQhF-M3Xj5ssLqm@^Va-0sc#%o&8Uy~T{-;!F`!5Wu+z7AI;8 z>=P;|cE4&$+~l{{DGlN~KZ*Hk=>y?u_GZPk+HI~!p|o*CzzRY3oTrFGY{4~hPf>!gQybP5LPOL8-b`2hGP?)ZTStj zLc+7B?9h%I?q)N}4N}Y~$-_Fjr6Y)AB})Wty7Pi^_Y%m>W(*Z5#F+?gFT8Ljc=+-V zuxlOD!OgZ00a&r;T22RZYykK_ufHtz-tMKE0=6y`q$wkm+RL%-j+2*S969U>mhe*V zpG9=PX>LfyLv(TWYRpK7Io-l8rYPJaN(XUu-*=I&7dVn|XXkCc<8AMu_&P)q`(mQZi;pv%YDI0LVAQs0JJJ_pG}89LMB`D z*5T;L=+I#1SG5Yp!J-QL_JK30+aLKZ#;F= zKMBBhDz|q|{n2!(W{3XJCQMq4A$ZlG5UOLf54=VL@THNd6RZL5E=QC+%!`I!z4X5@Gj7BFX_qV1xcKigu3kven>cd^1_Xe~`iEInQUPE*?lub;; zCi=%h&w%K2or$Wh*!1Y&c;gft9vL5m(Y7t^XF@2i{TnzO>CQ~d-c>&b?(g=^R}slD zqZUS3Fyt&6p4vy?T2Za9C7B5jArKO{q?Xy7SYC}{t@fJxq<+nWN(L|8Q>9lxlyQq9 zfrJAa)Y`*c{&Y`fOhrTYw#ReEdw$6TmdTBxW7%ZEuk>;`!$M0b4dITBEw97{&4zEd zM^sQI)Rpotsx=5gKNlqu5zajj+B68ZeipF>Lb0vJpo~$6(^6YU3jHgi*kQWu6*rP6 ztOH)&X=6q#+o4oqm8?A8W?~{FT#o!*uy1wKzH|oWJno!QPs)+B94-YxPB#3l>*nct z>%M*y{Gft0bL#rRylROZi(^Cxl0|$?f;fZm$bb1wrvg&HAR(eO1v|vHyqZQQb-C^r zGxb5}vw*qgcIC(2X&wS*VV}5qxqT%FIE9bCK zgTSm$%F;Y4Ft>;!v=2Hn-@AwMV^&+92jG@^`@o!fpRN=P=Z-d9GMyc5II2J9#%GoS z#6n!yh{2`Eoub#D7_yMg7QG!q980n33&%R4x~3P_Ocg@;PR*CQimnJoF!nZJVA*5{ zk>vl_QjR6s9x5WS<&`)m>UQlLsjU4XFt2KoJX}xi`84RI&|?WU_#Hx}$5K?C-&_6A zc6ty+n^0n#IGP?rsjyQv-T>x}JpFMsv~ML?<+alSEW-3-kWST7f9ME25$VZ{`}$%} zMB0tVI%{El@j@hWV969*kS%DT3WL)1@^gKzN?zc6;&g@CI912jO+D9JBd*R@7jC0I z3DnY|ELYmruwRGE){P(3Dn)%)2WG$k1IiwYVK{X Nc<^FkKCxbT_8-Zw%-8?` From addf3603ff914f3c9bc69dab9833c37a4f8f5613 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Jun 2017 14:19:31 +0630 Subject: [PATCH 02/10] update customer --- app/views/crm/customers/index.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index c74c34f6..f97de091 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -121,6 +121,7 @@
<%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> + <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %>
<%end%> @@ -230,5 +231,12 @@ $(function() { }); } + $('#reset').click(function() { + + window.location.href = '/crm/customers' + + return false; + }); + \ No newline at end of file From a48ff7745d1b68da5a3053f1f7f1b97dc7e1023a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Jun 2017 14:21:20 +0630 Subject: [PATCH 03/10] update customer --- app/views/origami/customers/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 340bc307..dd2b1b99 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -2,9 +2,9 @@
  1. Home
    2. -
  2. + From 344d27f0349469f00039188ed1de5895c363f936 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 14:21:50 +0630 Subject: [PATCH 04/10] always update dump.rdb --- dump.rdb | Bin 18800 -> 18819 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index 63a4647b0a10a4c97d4109a8cddff7a04d5b4731..41c567606bc13396e2e153dee67be78b0d7f6794 100644 GIT binary patch delta 1069 zcmZuwOKeP07`|t2J1u?P4oy6Q8IK4}PtW^NY0OLsT~rVo2|7cENIIrz%|>FOtw$me zoIQ<7*x0x%Sd}80vY;WA(2SLpsGe=6Q7n=O z&7lHCqpyIPgGGqizZDfk2_G%|>Y8s2gC?`=d9~IEL&CLUTw2^TS5mS6V}>Qt9Mcje z)|yC2Bt{5R^SR-iIng@i)&B9zg1{_fN;o`v*1{GwLMoM(s+fUU-0U^|?YmrQA;}+!5SEya(Q&1u(sX*gqU))uot+6E0VX95dm$+8>%CJGBq z8J&yR<|in`cBTpQF`WkBo$p0DKwVW3GZ7rxHlWlhGqG{Y?jxyf53->hxsFt;vo+oj zUEu~DEr5Xn7|~s7Xh;o!G$O8jgyKGq|}t4(!^PGlZ9AIa8U~Fz1Mh?z1sul`+xuM_x;aX z@YgiBf^(Coc=Vs__-J`>Z>3zho0}@sd~tPh>du>8*a)nU;8+MHy$?sn2FAWPF)(zh zJh<>LuuGr+ z4xB7ZY&%#TKQ%bqJqAw<4G+QrnSnnJjeQTht3hoy2Hp8a_V+u77Aj}g?62EC=>^jb z?^YAR#OT@oK-2=$F|Pd$Js|; zc@%bK5Lc23qTbJwdFx42iAmxK-VG8@K{~}nVo7s~xTZ>K<_@&1`?jOwf_=I7ey$}n z%$QP$N(0wDVSm{1-F`6V8?M;w>!#B2>i95Rg!2K|Sk|RAR+_0q+GvKT#+q?j4_57~ z&PjJ|dlmSr#cyIBzmfa7h=&juBh47YR7F$r;S`B6-<+}~QkUXd!)0${3ZYa;q`5X! z#+eo)X?OYKk`GqgtIorql@YFxAzT^}%iHT+?FcSz)lAb63Ed1uF@_9PoN84Mo)$}v zv>gVA7*PTdMKvMp{TYEL$eHJDH=lT;)vm5w5G9G)jLjogE{xk88Hm>JmW$*5BX%ryzgIhp-?qq@Jm+hAYAn@>mD$)S?a lnLs#vlZx0%&qa4RUj=Tx(3b^y`( Date: Thu, 15 Jun 2017 14:44:25 +0630 Subject: [PATCH 05/10] Nett Bug Fix --- app/views/origami/payments/show.html.erb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index add50dac..995e13e9 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -287,7 +287,16 @@ $(document).on('click', '.cashier_number', function(event){ update_balance(); break; case 'nett': - $('#cash').text($('#amount_due').text()); + var credit1 = $('#credit').text(); + var card1 = $('#others').text(); + var paypar1 = $('#ppamount').text(); + var visa1 = $('#visacount').text(); + var jcb1 = $('#jcbcount').text(); + var master1 = $('#mastercount').text(); + var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1); + var total = $('#amount_due').text(); + var amt = parseFloat(total) - othertotal; + $('#cash').text(amt); update_balance(); break; } From 0778df4e80219eff03fd86a1bb62da62ec99a49c Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 14:44:27 +0630 Subject: [PATCH 06/10] order fix for booking --- app/controllers/api/orders_controller.rb | 11 +++++------ app/models/order.rb | 2 +- dump.rdb | Bin 18819 -> 18312 bytes 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 7fecf7bf..6cb7117c 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -39,12 +39,11 @@ class Api::OrdersController < Api::ApiController # check booking id is already completed. booking = Booking.find(params[:booking_id]) if !booking.sale_id.nil? - if booking.sale.sale_status == "completed" - @order.new_booking = true - else - @order.new_booking = false - @order.booking_id = params[:booking_id] - end + booking.sale.sale_status == "completed" + @order.new_booking = true + else + @order.new_booking = false + @order.booking_id = params[:booking_id] end end diff --git a/app/models/order.rb b/app/models/order.rb index a53ba3cf..cd1f9233 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -32,7 +32,7 @@ class Order < ApplicationRecord table = DiningFacility.find(self.table_id) table.status = "occupied" table.save - else + else booking = Booking.find(self.booking_id) end diff --git a/dump.rdb b/dump.rdb index 41c567606bc13396e2e153dee67be78b0d7f6794..a449502b3451ef91aa35131327a4a23e02a9363b 100644 GIT binary patch delta 99 zcmV-p0G$7WlL3g20gx~eRzX5p`UrJ%Wn?XFWo^Qcr;$N?1JWMQk-+y1G&3?aE-^4Q zIXO5plfwah0mzd<0wV?=!$I0YO_M delta 384 zcmWm8ze^iY902fpms%4^D7H{RD0~wQS-k7}eeX3Da!IK!MG!$8Y<$Vx)j)pGnBbz6 zQd-*d^N=|PN7Sj&07o)V2_7jEzlVH!D!2A(-N6%NWptdSQXB#O9%NlFL>nCf;r-D)el ziOjpw=S-#3ZwBo`528jp0P}Jh_8YxjD0KXz>=S|t%ai2g@b&M#k2m&uSO+$E@YJ^l zX|5%c!ey8#iD6(6s@7o%E?``GWHl!C^Wn(ikg~Nre0;wXgev8^gnL3_en!%>MSInb U&B}cIb|shm`Q!TE#%X5zKQXy*TmS$7 From 18e855f5f9948184c0712262ca8fa50f07d06a1a Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 14:52:23 +0630 Subject: [PATCH 07/10] new order for booking fixed --- app/controllers/api/orders_controller.rb | 10 +++++++--- dump.rdb | Bin 18312 -> 18312 bytes 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 6cb7117c..47eb6394 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -39,11 +39,15 @@ class Api::OrdersController < Api::ApiController # check booking id is already completed. booking = Booking.find(params[:booking_id]) if !booking.sale_id.nil? - booking.sale.sale_status == "completed" - @order.new_booking = true + if booking.sale.sale_status == "completed" + @order.new_booking = true + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + end else @order.new_booking = false - @order.booking_id = params[:booking_id] + @order.booking_id = params[:booking_id] end end diff --git a/dump.rdb b/dump.rdb index a449502b3451ef91aa35131327a4a23e02a9363b..67f5fcbfab3db36f3e8f6111b60b0b7be16f9048 100644 GIT binary patch delta 79 zcmV-V0I>gvj{%5}0gx~eutP#w`UrJ%Wn?XFWo^PpR*^w`1Hwnyk-+#1IWjdaG%+wU lHaIeq!vTE(&9gxQ0Yw5;0+V4!8k1f}A_y9CydHTpDRY$P8)*Ol delta 79 zcmV-V0I>gvj{%5}0gx~eRzX5p`UrJ%Wn?XFWo^Qcr;$N?1JWMQk-+#1Gcq+UF)%eb lIXE+u!vTE($g@EL0Yw5(0+V4!8k1f}A_&W`i8-}Ik|>?e9KQen From 0bdecb737c4c869fb272c9870df76455122082a1 Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 15 Jun 2017 14:52:52 +0630 Subject: [PATCH 08/10] udpate --- app/controllers/api/orders_controller.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 7fecf7bf..6c0e2d91 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -45,9 +45,16 @@ class Api::OrdersController < Api::ApiController @order.new_booking = false @order.booking_id = params[:booking_id] end + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + puts "booking sale is null" end + else + puts "daksdflaksj" end + @status, @booking = @order.generate end From 739e7bc4dcb86f048f10c3bf070182235e8c77f1 Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 15 Jun 2017 14:53:56 +0630 Subject: [PATCH 09/10] udpate --- app/controllers/api/bill_controller.rb | 2 +- app/controllers/api/orders_controller.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index a01cc717..0f5a668e 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -12,7 +12,7 @@ class Api::BillController < Api::ApiController if booking if booking.sale_id.nil? @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee) else @status = true end diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 6c0e2d91..c5aff7bd 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -48,10 +48,8 @@ class Api::OrdersController < Api::ApiController else @order.new_booking = false @order.booking_id = params[:booking_id] - puts "booking sale is null" end else - puts "daksdflaksj" end From 0f41035b68fa228af6834b0a9e8225b281f724a0 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 15:04:49 +0630 Subject: [PATCH 10/10] add dump.rdb to gitignore --- .gitignore | 1 + dump.rdb | Bin 18311 -> 18312 bytes 2 files changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 02338531..f9e65957 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ # Ignore all logfiles and tempfiles. .DS_Store +*.rdb *.rbc *.sassc .sass-cache diff --git a/dump.rdb b/dump.rdb index c21c59df47fb80f5e3f6b1f7dcd473ff90531b47..3c28111097919f72ba1d6b6fa14b1cee5fe18c8f 100644 GIT binary patch delta 101 zcmV-r0Gj`Yj{%5}0gx~l3PwU%`UrJ%Wn?XFWo^P}_!9vB0Q(UElVC>|kzZZ|z;NP` z!0;0iF*G?hH8C|cGBqwYGB-IgH8qpM0eu0|k)ao}R|4up0$Ku-U`HC0T}L7a^2N*S Hw?YLlPCq2` delta 97 zcmV-n0G|Jdj{%2|0gx~l-9$oJ`UrJ%Wn?XFWo^QMwGsgS0Q(UElVL{}kzZZ|PTbv* z!0-|gF*G?hH8C|ZGBqwWI59ObIg`TyeF4q0K>`6q0#yQ&VMiL1UPmGb=_+pd@M$#G D-8~~j