From 3db2db093b9d9766c8754886d3a3c6614ce5f597 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 19 Apr 2018 15:17:59 +0630 Subject: [PATCH] menu export import update and print setting update --- app/controllers/settings/menus_controller.rb | 32 +++++++++++++++++-- app/models/menu.rb | 26 +++++++++++++-- app/views/origami/payments/show.html.erb | 10 ++---- app/views/print_settings/_form.html.erb | 2 +- public/menus/Main Menu.xlsx | Bin 4375 -> 4585 bytes 5 files changed, 58 insertions(+), 12 deletions(-) diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index bc92a959..f73226f4 100755 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -99,11 +99,39 @@ class Settings::MenusController < ApplicationController sheet.add_row ["Name",menu.name], :style=>title sheet.add_row - sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Instance Code", "Instance Name", "Price"], :style=>header_text + sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Attributes", "Options", "Instance Code", "Instance Name", "Price", "Is Default"], :style=>header_text menu.menu_categories.each do |mc| mc.menu_items.each do |mi| + attributes = "" + i=0 + if mi.item_attributes.length > 0 + mi.item_attributes.each do |mia| + attribute = MenuItemAttribute.find(mia) + if i == mi.item_attributes.length - 1 + attributes = attributes + attribute.name + else + attributes = attributes + attribute.name + "," + end + i = i + 1 + end + end + + options = "" + i=0 + if mi.item_options.length > 0 + mi.item_options.each do |mia| + option = MenuItemOption.find(mia) + if i == mi.item_options.length - 1 + options = options + option.name + else + options = options + option.name + "," + end + i = i + 1 + end + end + mi.menu_item_instances.each do |mii| - sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, mii.item_instance_code, mii.item_instance_name, mii.price], :style=>wrap_text + sheet.add_row [ mc.code, mc.name, mi.item_code, mi.name, mi.account.title, mi.alt_name, mi.taxable, attributes, options, mii.item_instance_code, mii.item_instance_name, mii.price, mii.is_default], :style=>wrap_text end end end diff --git a/app/models/menu.rb b/app/models/menu.rb index 28b23c76..6d7e9cbe 100755 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -153,6 +153,28 @@ class Menu < ApplicationRecord # status = status + "Category Code already exists." end + # Menu Item Attributes + item_attrs = [] + attributes = row["Attributes"].split(',') + attributes.each do |attr| + attribute = MenuItemAttribute.find_by_name(attr) + if attribute.nil? + attribute = MenuItemAttribute.create({ attribute_type:"any", name: attr.capitalize, value: attr.downcase }) + end + item_attrs.push(attribute.id) + end + + # Menu Item Options + item_opts = [] + options = row["Options"].split(',') + options.each do |opt| + option = MenuItemOption.find_by_name(opt) + if option.nil? + option = MenuItemOption.create({ option_type:"any", name: opt.capitalize, value: opt.downcase }) + end + item_opts.push(option.id) + end + menu_itm = MenuItem.find_by_item_code(row["Item Code"]) if !menu_itm account = Account.find_by_title(row["Account"]) @@ -160,14 +182,14 @@ class Menu < ApplicationRecord account = Account.create({title: row["Account"], account_type: "0"}) end - menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: "[]", item_options: "[]", is_sub_item: 0, is_available: 1, created_by: created_by) + menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: item_attrs, item_options: item_opts, is_sub_item: 0, is_available: 1, created_by: created_by) # else # status = status + "Item Code already exists for " + row["Item Name"] + "." end menu_inst = MenuItemInstance.find_by_item_instance_code(row["Instance Code"]) if !menu_inst - imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: "[]", price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: false) + imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: [], price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: row["Is Default"]) # else # status = status + "Instance Code already exists for " + row["Instance Name"] + "." end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index d5ac5bb8..f31341d9 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -433,12 +433,9 @@
-
- -
- <% if ENV["SERVER_MODE"] != "cloud" %> - - <% end %> +
+
+
@@ -1049,7 +1046,6 @@ var customer_name = "<%= @customer.name %>"; url: "/origami/sale/"+sale_id+"/"+cashier_type+"/payment/print", data: params, success:function(result){ - console.log(result); // For Server Print - from jade if ($("#server_mode").val() == "cloud") { code2lab.printFile(result.filepath.substr(6), result.printer_url); diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index e07da111..ae1f90c1 100755 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -16,7 +16,7 @@ <% if(@server_mode != 'cloud') %> <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> <% else %> - <%= f.input :printer_name %> + <%= f.input :printer_name, :as => :select, :collection => [] %> <% end %> <%= f.input :brand_name %> <%= f.input :printer_type %> diff --git a/public/menus/Main Menu.xlsx b/public/menus/Main Menu.xlsx index a35944b08060038e4423411b423ca20df5ba36cc..2987ce8986a0cb975aca8635c3972fecdc96eca0 100644 GIT binary patch delta 1891 zcmV-p2b}nqBIzTrtpf#q88Foild=OVf2oDWn1l% zJ>LC)_v6Tw>)tfk0esM{tq?5;%D~E2X=1sn-iSDqzQ#_-Z&3qY5OR+VM4?0!cogPtGNO}G$w}#ce|(b! zN@8fhfQclym(Gk1}SK*XQWFPcIbzN6<%ft=)Q~dez{Fc6&Ya61l z5)dzyWYU9(t>>a|LSN!pr#wA;Y=FuJJv**_PCk~8PumUR3qn^pxy|XrmfkT!7^S<> zbupjL;o+din{iU&d6}xqTk)Gev)lx?1PUQHT)WE!007kCKL?1!!VhRF;=)uDIy*G5Q4Ubb8sx;Y}(ZI2GwHypx;6 zlKp*>KK&%TR_E2%C^Q~1O9+j-rc<*`1IIoMNWAEpA3qFVdgiNMXHD6cWQj31#N%<& zHJ6;Pt}QF^mpDR6e~qqiEbh!Hix3w@wy=^F!zjo_QE0ig-LxV^VzY3#W|w%-`JDK8 zK>akrF)vIQ4iOifO_pSpAp5iPmD}GKx%uXukx=+KmVs^x|AK&6RK6+%Dr8GuQG|jU*y_rph>fXBygfOq$%~JNz@%3&J zhB-50hG!_jqNkrpz?WUq+mApD`7O=@6CL*QY4=6I`M*X)GVo0!LSOU$XE@tYPVVq*R$I@-@?%?9o;I9e@@L+J6@HJR}~zcR;{Uate1}U zDvphsr*>?Vj*TjgE;Q<9>Dc^kqi&UsttyUot*&~p>vp}~uGdd3 z+ofguy9FusvXXJTif0=dxU*k3RTd6BJd~KuzbXEq-uF^fmG4z z8(4bd`!tQYL^!;l&6|)bn*9-0e?VW+ER+e~e`@;6IU}=_<3yqz!P@t${G~}Eyw!{~ zPB@BvteT#?3+0Ne#<2XJi5EbLY@%s3F$TpiKd@TrhqY19-5M&mZQGG830O6y>B@L5 zUPxri0hSV3a|2i-sNfIctum5n-@w`-rGab}z$zK}$BLPF^06nn^LUK7CN%NN7rvO_ ze}JTs402dK#z|r%E8;)B$S)}gWx#8~m!^NGPv3b+vfj%eKNiPDEVgae?9*%}PmJ(TVe*;*vCs(F@18Y^}!YUcLO)a^w=XUe^cJtSE z^Y?c1+jjHscJt46^T&4c=XSFZMH$PL`*^F#UK;+LKKx?Om5Ikq3Aye$xlni~QvAr7sGwN(C*fl0oZfp{?vWs;s!ZAYN6z zcd%Ce0zCH4ux!{eF3;n!f6};p2Baee@;ny>kdA%y3D15Wk{X?wNu5vyrADWu zQlnF0sgcRJJdw!3tnNChF1gi4EZDTAKjxQ&{Bo-L>;FVuka|w3B&GjjY8`!a&M*5Y z^s{r#Gz_!L_wksbVD}N*>UCC(#Jv3SmmTtQ;-j#SV~*L;f#i}h@{Pt^RCWua>?HVb z>bN)@5gv|EvoqESVhbW#VZ|w%U2BPvg!$oQaXq7))2KXR=5$qF%_-&C@uXdA6wU1m z*8cETycml@adVhIpMB;&E{o#+h`RT~f0MHggav*XFx3r{JP%X>+mn$GJpq@K&ksid ziIW!)Kmpy8SP(n{&=NIP67Y`g%1D#00115u73ak delta 1680 zcmV;B25N*Q9DDX)fGoDFX zqC*IlVeI7rwD4IZObqv((;~#uHP{OIEgHZpLLRV&AZif=9)+o$jp(eb<*c+nf3BSb zwZzbZ1`|A{8O8ssR^ive&5296paVGVZ^BbDlY>_?)%ShYuO}|UlE$8WRudoq8oOfGeW*b z*VX)V4hKgy-i(t1FUzUAz7@aw0Ryw!1h)hVikHh7_yhm|02z~<2_S!4bJ{oSoUko4E@=R?3ubbw565}n@n(Lh|*{{P8gT6q=t$gB@j0#Rg+;!0@~nnj6lymzGt;8=Rq{ zN4GeKo)u*o;!tI4tJr@sjFMWErIu^kzLg=8n~lRIJH>;pRwTv~8kZT)d1JzGia1QR z*pO{eyImGr6yu=@0SnBYu{j#lVegqS8f?)TFEIbHh1!bn2YL?;Lvw}F0-J_48d&Yv z(I6oZrCJAr;nmQ*axQNi8_cYIM{E3(;9b!v8#|IGba&4v$1#7e7qa!|Xt}^CG~#66 zR&40**M@MsXr|q1zAJf3a=duWmNYGnx~8x!Wr_}sjI1}1&K$4!(ZGK(qcDoIvTgXM zOffrZpt~_mzrpUnws$+eGLp<8{=PB6D^#YuY6k_~yZoj!Tf``Z**i86Q{l0s^r>2m z8DwgAhAgU8nxlVLTGnfI+*xggtnYgTLRz=I?NT+UTYlSwY0V7m@DddmX8MaHd^0q| zeFl*7H(V_kOgOB!J%$CY{~8&oz&DKyz107gxZqR5-*S!1g43*ZY?^jW#l7g+p6>)v z5O{8AM{mB3quV;V=Quh&SMGSxI$oUN=mb4q?$~b~`{#c+dc9EY=(UdCIgYL>Yrl2$ z|5(;R>lmElX!rVZ$FOw_&vA@Yj#29v{jsd!C~Fb7&+v?Tei(&e;P>r*KkE0JBeVJN z)E~VG;%GErbZ4;o(*qH!(iIeo8Y~Dx^7>Tc3=UHQLO%MAGCZ(2SXFf^ZdG5@s#|z| z7`HetkEMSWMBh)rtxt(|PU^qsd&D`b?j?^H{+9M=GMEE6$ra*|y!Y_Y*s!!aGpmeTWLRN=b!U zDyBlMQB$GT%BWDQL{xZMDm0lB?zkc@^vOGqnJ9@H?;RAb0t){Ch5sQa)G8$uYAF$| z%S3;z*+U`HUaPe-DAXzu6uuS;P3FSXXZqBeqe3LU@dZ@4QYwN26~Tw7P^*+wsHI{m z)EYGvYORb4wMs-qprt~SIpMC53w`pgCSRQT*rt7Jf^RU#llEf6Q9F3WwU){1}MMsC7)KzO!-i0D8>q$Xl6Awn&ilmAM} zL{MmSe@lQ+%YM@235keM%Vb2TRU#rHEfKoBXA&CDp36=24h2Vrf@62SbK4(-L8Ft? zpcBe)(CDN*Xmm0lG%^tpM-nj-+T?)=TlnBOCH+qe*_V$abwkK|I;_s+OkEtKG_HTH zz{@nPig)>(qU7ze#~KZ`jO6@oTi>i#zXxy-{l!l?Su;BY~` zKHMfBZriKt_*=x*1fsC!Le}mDkV{(MV>jg`<(y{iuMwPX+tP|sUfpEdJ+BG3uUPwg zet5ruO4B*5$5+=u-8xkFzh;d7`X7^p4}=8*BfPc_lMWD60o;>g5Iq5ylc5kt0g999 z5I_OmlPVEB0?`PQ>