From 2d55ea0dab7556f28f81b5a3df8d96bb6dc4296a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 7 Jul 2017 09:56:18 +0630 Subject: [PATCH 01/10] update add order --- .../javascripts/origami/addorders.coffee | 3 + app/assets/stylesheets/origami.scss | 1 + app/assets/stylesheets/origami/addorders.scss | 3 + .../origami/addorders_controller.rb | 21 ++++ app/helpers/origami/addorders_helper.rb | 2 + app/views/origami/addorders/index.html.erb | 108 ++++++++++++++++++ app/views/origami/addorders/show.html.erb | 30 +++++ app/views/origami/home/show.html.erb | 8 +- config/routes.rb | 2 + .../origami/addorders_controller_spec.rb | 5 + spec/helpers/origami/addorders_helper_spec.rb | 15 +++ 11 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/origami/addorders.coffee create mode 100644 app/assets/stylesheets/origami/addorders.scss create mode 100644 app/controllers/origami/addorders_controller.rb create mode 100644 app/helpers/origami/addorders_helper.rb create mode 100644 app/views/origami/addorders/index.html.erb create mode 100644 app/views/origami/addorders/show.html.erb create mode 100644 spec/controllers/origami/addorders_controller_spec.rb create mode 100644 spec/helpers/origami/addorders_helper_spec.rb diff --git a/app/assets/javascripts/origami/addorders.coffee b/app/assets/javascripts/origami/addorders.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/addorders.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 7935b50e..1f195ba5 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -211,3 +211,4 @@ tr.discount-item-row:hover { margin-left:-40px !important; margin-top:-40px !important; } + diff --git a/app/assets/stylesheets/origami/addorders.scss b/app/assets/stylesheets/origami/addorders.scss new file mode 100644 index 00000000..f45d06f3 --- /dev/null +++ b/app/assets/stylesheets/origami/addorders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/addorders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb new file mode 100644 index 00000000..68a15c71 --- /dev/null +++ b/app/controllers/origami/addorders_controller.rb @@ -0,0 +1,21 @@ +class Origami::AddordersController < BaseOrigamiController + before_action :set_dining, only: [:show] + + def index + @tables = Table.all.active.order('zone_id asc').group("zone_id") + @rooms = Room.all.active.order('zone_id asc').group("zone_id") + @all_table = Table.all.active.order('status desc') + @all_room = Room.all.active.order('status desc') + end + + def show + @menu = MenuCategory.all + end + + private + + def set_dining + @dining = DiningFacility.find(params[:id]) + end + +end diff --git a/app/helpers/origami/addorders_helper.rb b/app/helpers/origami/addorders_helper.rb new file mode 100644 index 00000000..c90e5344 --- /dev/null +++ b/app/helpers/origami/addorders_helper.rb @@ -0,0 +1,2 @@ +module Origami::AddordersHelper +end diff --git a/app/views/origami/addorders/index.html.erb b/app/views/origami/addorders/index.html.erb new file mode 100644 index 00000000..50e52d3e --- /dev/null +++ b/app/views/origami/addorders/index.html.erb @@ -0,0 +1,108 @@ +
+
+ +
+ +
+ <% @tables.each do |zone| %> +

Zone : <%=zone.zone.name%>

+
+ + <% @all_table.each do |table| %> + <% if zone.zone_id == table.zone_id %> +
" data-id = "<%= table.id %>"> +
+ +

<%= table.name %>

+

Seat : <%= table.seater %>

+
+
+ <% end %> <% end %> +
+ <% end %> +
+ +
+ <% @rooms.each do |zone| %> +

Zone : <%=zone.zone.name%>

+
+ + <% @all_room.each do |room| %> + <% if zone.zone_id == room.zone_id %> +
" data-id = "<%= room.id %>"> +
+ +

<%= room.name %>

+

Seat : <%= room.seater %>

+
+
+ <% end %> <% end %> +
+ <% end %> +
+ +
+
+ +
+ +
+
+ + diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb new file mode 100644 index 00000000..1a2e7b8b --- /dev/null +++ b/app/views/origami/addorders/show.html.erb @@ -0,0 +1,30 @@ +
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8b613409..cb18971c 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -302,7 +302,7 @@ <% if @status_order == 'order' && @status_sale != 'sale' %> - + @@ -312,7 +312,7 @@ <% else %> - + @@ -555,4 +555,8 @@ function show_customer_details(customer_id){ } }); + + $('#add_order').on('click',function(){ + window.location.href = '/origami/addorders'; + }); diff --git a/config/routes.rb b/config/routes.rb index 2b7db5eb..b04bed33 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -156,6 +156,8 @@ Rails.application.routes.draw do get '/:sale_id/customers', to: "customers#add_customer" get '/:customer_id/get_customer' => 'home#get_customer',:as => "show_customer_details" post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer" # update customer id in sale table + + resources :addorders end #--------- Waiter/Ordering Station ------------# diff --git a/spec/controllers/origami/addorders_controller_spec.rb b/spec/controllers/origami/addorders_controller_spec.rb new file mode 100644 index 00000000..9e0643ad --- /dev/null +++ b/spec/controllers/origami/addorders_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::AddordersController, type: :controller do + +end diff --git a/spec/helpers/origami/addorders_helper_spec.rb b/spec/helpers/origami/addorders_helper_spec.rb new file mode 100644 index 00000000..f9ea7bcf --- /dev/null +++ b/spec/helpers/origami/addorders_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::AddordersHelper. For example: +# +# describe Origami::AddordersHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::AddordersHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From d99ed58d28b7f7f1a527e7ea2a7cb9c94f4627da Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 9 Jul 2017 21:00:33 +0630 Subject: [PATCH 02/10] update view --- app/views/origami/addorders/show.html.erb | 16 ++++++++++++++-- app/views/origami/home/show.html.erb | 4 +++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 1a2e7b8b..98055c46 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -4,7 +4,7 @@ -
- -
- +
+
+
ORDER DETAILS | Table 21
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + +
#ItemsPrice
1aaaaa x2name
+
+
+ + + + + + +
Sub Total:22222
+
+
+
+ + From 83b8d726324be48f32807b36cf9d4371038ff7f1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 26 Jul 2017 15:04:35 +0630 Subject: [PATCH 04/10] update add order --- .../api/restaurant/menu_categories.rb | 37 ---- .../api/restaurant/menu_controller.rb | 2 +- .../origami/addorders_controller.rb | 1 + app/views/origami/addorders/show.html.erb | 163 ++++++++++++------ app/views/origami/home/show.html.erb | 2 +- config/routes.rb | 2 +- 6 files changed, 111 insertions(+), 96 deletions(-) delete mode 100644 app/controllers/api/restaurant/menu_categories.rb diff --git a/app/controllers/api/restaurant/menu_categories.rb b/app/controllers/api/restaurant/menu_categories.rb deleted file mode 100644 index fe7983ea..00000000 --- a/app/controllers/api/restaurant/menu_categories.rb +++ /dev/null @@ -1,37 +0,0 @@ -class Api::Restaurant::MenuController < Api::ApiController - - #Description - # Pull the default menu details and also other available (active) menus - # Input Params - order_id - def index - @menus = Menu.all - @current_menu = Menu.current_menu - - end - - #Description - # This API show current order details - # Input Params - menu_id - def show - @menu = menu_detail(params[:id]) - end - - - private - def menu_detail (menu_id) - if (menu_id) - #Pull this menu - menu = Menu.find_by_id(menu_id) - return menu - else - Menu.current_menu - end - - end - - def menu_params() - params.permit(:id) - end - - -end diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb index fe7983ea..169cc1fd 100644 --- a/app/controllers/api/restaurant/menu_controller.rb +++ b/app/controllers/api/restaurant/menu_controller.rb @@ -1,5 +1,5 @@ class Api::Restaurant::MenuController < Api::ApiController - + skip_before_action :authenticate #Description # Pull the default menu details and also other available (active) menus # Input Params - order_id diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 68a15c71..e65b24b7 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -10,6 +10,7 @@ class Origami::AddordersController < BaseOrigamiController def show @menu = MenuCategory.all + @table_id = params[:id] end private diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index c4f51c1e..049ba371 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -1,65 +1,42 @@
-
-
+
+
-
    - -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    - -
+ +
-
+
-
ORDER DETAILS | Table 21
+
ORDER DETAILS | Table <%=@table_id%>
- - -
+
@@ -90,21 +67,95 @@ - + + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 92b37cf9..8281a16e 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -579,6 +579,6 @@ function show_customer_details(customer_id){ $('#add_order').on('click',function(){ var dining_id = "<%= @dining.id %>" - window.location.href = '/origami/addorders/'+dining_id; + window.location.href = '/origami/addorders/'+ dining_id; }); diff --git a/config/routes.rb b/config/routes.rb index e4723a22..310ae0f0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,7 +30,7 @@ Rails.application.routes.draw do namespace :restaurant do get 'zones' => "zones#index" resources :menu, only:[:index, :show] - resources :menu_categories, only: [:index] + resources :menu_categories, only: [:index, :show] resources :menu_items, only: [:index, :show] resources :menu_item_attributes, only: [:index] resources :menu_item_options, only: [:index] From 50a878349d19b512de9dc5efd53997d4f99ca659 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 26 Jul 2017 15:08:44 +0630 Subject: [PATCH 05/10] update add order --- app/assets/images/logo.png | Bin 0 -> 9424 bytes .../restaurant/menu_categories_controller.rb | 39 ++++++++++++++++ .../menu_categories/show.json.jbuilder | 43 ++++++++++++++++++ app/views/origami/addorders/show.html.erb | 4 +- public/image/logo.png | Bin 0 -> 9424 bytes 5 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/logo.png create mode 100644 app/controllers/api/restaurant/menu_categories_controller.rb create mode 100644 app/views/api/restaurant/menu_categories/show.json.jbuilder create mode 100644 public/image/logo.png diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..578d16f7b25ca4b60a4db70950c07c23d96c3ce3 GIT binary patch literal 9424 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 W;#|`CF$kdm0000 1 then + + json.item_instances item.menu_item_instances do |is| + json.item_instance_item_code = is.item_instance_code + json.item_instance_name = is.item_instance_name + json.price = is.price + json.is_available = is.is_available + json.is_on_promotion = is.is_on_promotion + json.promotion_price = is.promotion_price + json.item_attributes = is.item_attributes + end + + end + #Child Menu items + if (item.children) then + json.set_items item.children.each do |item| + json.partial! 'api/restaurant/menu/menu_item', item: item + end + + end + end +end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 049ba371..952836d1 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -81,6 +81,7 @@ $(function(){ }); //End Booking Click function show_details(url_item){ + alert(url_item) //Start Ajax $.ajax({ type: "GET", @@ -109,9 +110,8 @@ function show_details(url_item){ +'
' +''+ price +'' +'
'; - + $(".menu_items_list").append(row); } - $(".menu_items_list").html(row); } }); //end Ajax diff --git a/public/image/logo.png b/public/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..578d16f7b25ca4b60a4db70950c07c23d96c3ce3 GIT binary patch literal 9424 zcmV;>Brn^EP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000^LNklv@+@4R8j~2w1=-;1!_nSb7Ql7zZH^d<0ko z%mhvXCIL3k3cLwy237*A0r4InM}``KuK-s7;|jE^z-;*g@GW2~a4&G@Smqk_7zE>6 zQXGA`2pGj^Ch$-4+RwfR$jE6T@I3H+z#PFilY##R9(WIs!>5_RdSKxwj(H{UA`pHL zkm1od$r+Q6z}O3bXWs*4c=UUq;Rud@I&jx}R#tEYep-NjyMc#+*Q7P211HGI{uB@? zbNy1_m%ysge0W1sQBV-Wu(p*k>=@Pq`vUa)F7U6wKnW%OUEuR&#@Pu>8RKs2Y9-zu&9@ez&qGKRMO+^ex z3_nscR;{e_O0;zXw~k=!o65AG8ypNl$k3<^nXGQx!NYGikxZwliG&XejIj*J@g>?G z8sXS&zzZeX7X<|)Vi+jE>TNsN+|f93-VS_Q20U2MSZ8XfnH6_|=gA5Q4nP{rQ z%H}p+*|CSPu3_lvh{MTaQHN-_xs779V-)VuQKGGEoGfMGJ>&xT%yg!&Akr+V{2Cr zPi@^s*0u>7`Vj+TECaF%*j1wa2H?WO828&{9KV%7rxyyTiGVGVPB6UmwPJ*8#Vb;~oJRs!CYb*tEZk6ACK|c zo_(y_zMFW+B&2Ca4UD4+hyhdrRlsmOse6In72%#60&+%>^z3&GP1|4#hi6*1^XA_D zL<|i>JtP#O;1=g4q;WCobfi3W9r&p98Rh{e0u}OwQa}rC`2028ocaC|V_k|{fp~)a z|Gxn@26%?g2jL9hSHLYbkuYnv?_ynZ8}WFQkbcmbI!(UIT-?gYTDg#O(r0;DKHrl- z(?}<7v{SgXz~2B@15<|~ntp{_QMjQeNk5xxPG z0=lXKTmyVz7<$Sx*Y58s4$$ve;KQDu@#L0P z&zkzM5aL#X6;~9a$8k$tTmBR}M8{2g-p$C%b-pUaSYv^(2%!1%ThV$}%2 zK>A3p0T&-_K%&4)0j-^&bRurfW8N^YTN+SItpPq#0E|0@5VwrtdsIn-XV?=ihmi_8i3qA3anj^t%-Jd4PT| z0O!U`!)fa5VMWtH5Bv%t#Mh3n+5bxdrVS3)>^+b2g=gT_PW>9UHg`L2uA>f^4=iDD z|3*IDDXq0~bUDGwc2)}^&WndkvX;%Wt=rw4xM|i1A$}h4ogW3BlBR7AhyinePZF#M z{5L@?w!^iu+5(uh{|@{^86V?|zz-Q(>iM5#Jamti$d@cfYk`Hjs-h_Hht?gmb|<~$ z(tXlIFGWvD%Wp%8J|CCP>hWd9`U~I}qb;&73joGvfG?E+!vpPP1~Y^~!MHRa7|#KV zgb*acAvW&oU`u<42gZZ|VB9JvdqV*KV?OY7nSTFxBy`9ZOU8s8=Nd&-9}17Fr()`K z!nJj1W(X9eSQWq~$@V`E2*xGSkt|2+fDa2HoJ1rbAXsh>Nax|7c!+Axt^-vM$5 zl2TYI`3m=i0Qdit)Jf&&dEgwtF*J>|W%JU`y`*JPf((f)DRKQS;M&8~ub;rJz%R9+ zo*6Ab7M0)(%&O`eRKw(z@7=`qCx3^Pv)EZ(O>E+1CY-&Psh?OvW#cST?R&BM`%tuD z6_8v}PX78h<6LP#5H}6h?%2)t?j+T*hzG_r;Qb>JEhVTKx0vsWBJF34rpTI8)H=}h z7xhS_<<*+VH-WAZ0`hW^c$_!qQ%4Jsf*T|?BZM{3|JIhD--WJg zzf}zL8iY7Qt~3Q9KnRSADiVz|*t32uFaQ1DU=8%6MI?V@b4j+-btLy`4xs z_;*4Hfp8om6>%c<6R@*cR9!0-4jB$-IN+8&YKlTtD8#zt9tJWQs$LJg56>xt*1%3|Tc$FfRrh%d;yt-!}Tf4fc2!{)$V1I>Mq1cx< zIZ;Yiy9A|%GF+G{3dnP9JE@I?nN(T9wCYNxC#vYpWU+;y04#?Vuqg`GKpz!Tr=OiT zeok-q+izh+V+bKG1KP>k`LhvLWxM(M3hbq{1`{y~xHw zgIK8)k?|9kO#a9P=~Oyhsi+z<3VeGZ5vLkvF(>f~g6;o!QNSWaQS7RaN!&DO?Md?c zEiL?hON$#CG4!Kepx~qHO0>OFO26pfZpo^SMaftePdB%*xuc7dCe$;%I>CWVmaJ|2 zLlNnG<*sNNeQmArNsBL>SO3_r+fsXXU29e)azcnxq%+q8+^DE3j^&W)>2e*zp`!8f zfTrzBLWo5nUAIh4Wm``#8{0eB){{gCs4xvwMM3Z&&w(s|<-oV7UF-F=S`%u-ZUM^WAY z&Qw(Ofn0x|rf3S)b3TZb8Y0Oq3K+FrFN8QNVi=aLDy(eT&SUR1)7qURZWvUBOcV*m zpNJ*|h$K7|*fA7xa;qa@G*w~kj@>-IxtaAl_mHwILb`_HMm2|!V_8%-&SvLRE7ZN~ zRv$P0%(Kb$_Zr=;EzP-P@*ZJXOVXVkSEf7KC(XRux0XgHWh+*V3 zRbj=}ZER}qpdvITfbbl?wYcR@r7XgYCByHD+aD}>m#l3wkj+sSi*f#}X;g+y`ZBq- zilUt1=>$dBNz6Q+<)1u*e^KExEEI6A? zR|i%)b)urG-;m~QATbp&jI5?AJlWJrb7#+}Z7{L`5sViL;Bg2-cDCOmSt)h zMnt18o8{q6O`Jb#I@7DGu59m1HG_j=Sxh)(0ndN=D#G;*G+wZTr!G2|#wDN8&-&Sa z$M(LszHVUOo_$p_X6GVx<8SKQ-csjS)D+fm4;GzPtkgknSX0pwzx9vnhX_-(F`%1s2-%&f~L^eNg4_kio z3$AWXvf;K{(Bm=8arF%B?Wi{@D(mYeOeWWV;Ns-gO{lt2$kZ*x8RrxM4}zq;;&@4xn1`uFTX3&&|(@)z{)-idS)hZVXO zLR=6rj8p+IPLyJ*>KFiH9dH4qx91h)5QQLn_JkleeoA+I<)ascS~ve$X5NBtnz8t& zx4-br6C0M@7d`o+OTH4Tty}WWD?eYf_`xUWZQY7GyaZGe@J%7aZzG050WjuB&ZsyB zMAWUgWwpa59e6?p+y1&7AZS|7358lCJ6h_aktp^%Z@e7J47{a;jN2nM^_^QEdGyW` zuleF-Mxy3ZeLLGOP|Z*fyYvMa)x8(6bxp-`Y*x1H^n-CRg|{V)CE6_K@h;pWp*UPX z2oz{jRg7KR>QiT&_u|g8KAOoj9^aa{|Blng{ns534q@lAMCEeSOOmO`m{U zzcmN9JSHKzaR4{XxdnGG;XD4@#0-P=yY|x5-a#T31^0BG8)Y!DdkjpxBInJL(d^BV zbJrfuV7B9sv2Aj;gQ6%00eK_H#lkSrdO9bgC@8t?so5EGNX?y(`u6L%c_@LC%XvC{ z52aI?Mc-Bk;m@~s03YHQIF))hl(lU#mQBRaX{=7r5Ra0zogsiE11U>4Ab6MF-SJ9x z_6O)+xESNj*G6r=yu5}lCzE}*fS@P}IoqZ$o1-QYX5RRErd3x_88V3)2DUQ@NWWyg zAho(1fa`^Bpzq&JcG@hIcnl?zLPX-cN5#QN<#MQs%9&FpGOMPVQ3Ws$WVx~%j; zS%{BI@&U<6{qlzV*)Sx0>^KM`1giROlPCo#XFCW4nyR7?Bbe!dVLO7wv!*hqu7;j; zmSj3JL{#U8PJW16{-2Qw^flZqWV=g=FU7WGvPl{FDgrcBJ($lJYw|u34q<2-y_pRC zmOUi*;(rHA2yDkeK>-D_mW`q)oIiUyGiwsG_oo8IvYK$uBODGNx*5O&eS~_uvEo(e zs*0)W7^;e@Y1oc~RX82&dZwyMNS;}kb(}$^K1P5@jUGMyo2 z9RATqs-lp}S)?p$$PukV2y{&)s_Uq#isLv8SQeHvIS=+xRU9Fx3WxaM_-L$YcrWI;N(gjiTP@NoP2B`V`JN zZZbVS#i^+(S=(l7XAk>&571Cq!OYqOrWCDy?$T5h%W;MPQH;DJ#mkB3;dtsJSIC-< z(tp5>O8Uf2rD@^_L2GxCJqP+ogu^5=8EnU)DjXWJ>PCxHMImF^^rSQNX0nH@>=`u) zPN=UXYuOCsEc&v!gOlhL+GQOlFo*hA|44P;5kFeP%hOkdOf*%cJC#ON6e9Z3Kkm^p z7zT1VdQxcya=Akc2nF}Z@FHM*RYo69I8x7e)Mmw7d73O89c8n&23a7jDBw7PtZfhL z%=G|t67He@NcZ5}BQa0M;y0-BX)5lX$NQzPims{DMI+=Kdo=Ik|8he0k$RbT10Yjy ziwsT!7|7*#-?(aK)mGD=vqtkies8Y-JwS?6v;4giAZJNCjCXYmEym~O;z5<&@I8&;GVRz26uZ{Wr_QL9rvum=YYSLf4>wr zVdXvFBB@NHxEaG=06)UblX&|_<^%UDs=B}y0?TnK6op&lxEpbc@d};R5C?9S@9{eB zkxm9~9_P2dYf5eRisF8;VHNPUyw}x5`ksfIkb52X2$8$}`pEBxoFFG=Vu3-vARly* ze8FwFd&~WY%~-g3i^~hVcq?w@#g05t^E8LU=>lfp?n9rE*JqJ1Wz*|^2cD6l?b zSyi*fRX@~mUzb3gAJV;k$Iu{SAQ^17cen9gl+1A$I|bu`l3Se>9d zo&K0Kc`e{n$^B>J9yahJdCk=fooGoBn~Jd(roD=qAY53$UE`w-*bvy(NEp8A-36 z_Xh>~{*RoXSOH!4L&-Vho1g+rT~#qv6(K~2@48!YYt7ckN&l*B^A~meiv+7*a&Ecf zXZz&Xo}L(B=$??I1k0oA8T$R*x$-$;@|`Z0+$vO`-}Y(TlhDqQa{N`_YR#u`2`95q zo90`Io=EUGtq{FYWbAFFyl`6x(zcDFD1YYzp=#~Pj z)K4E6t}o!lpcsrzt(E%Vbh)s+DC14IA06|H-TX@Y50(ilnNpN{KxQT2-p4E#$bUD= ze=qi3d%NU_Yvp1W()3;qTXj1nLoXFMi<7dlVmRB3W%hBI*1cBqR+ znN?d&%Cf#KLn$XoTmQ4bf8>d)$9(_)zEAvAQTo7s&v!{leT(#4E|%8ZdO6YWNEhIH za{dz1|L~6OxL1PZ87Gy%CAx27ekK*n&Ay301^2kUexCyrB#v0l5xqk?Qs0zfWu?!Y zUU@j+59D&3JgI?(SoHMHfz&NB19+8OdD|pc_!rwoX+?VRu-BzCd~%*MtobJ04+yyD zfn6*a^y|`WUoGe9d|%AVJK4eej=T3*OT2`Tq8lO#Sajebg%3KUBb?^Q^z$<%do@I^E|SEt592pDvXwza{VQ6|(JD z1;ovX(yM;B$O^w&{=OUcZI{3oHCK5n<>0NzKbgT zqhdQ?=g1Wrk^p!M?i=!bJahYfa#9O@N~2EtA`NmOJwoA6{KX}AG|G9pAK(6w{~G|X W;#|`CF$kdm0000 Date: Wed, 26 Jul 2017 18:26:55 +0630 Subject: [PATCH 06/10] update add order view --- app/views/origami/addorders/show.html.erb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 952836d1..8fdf0c32 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -81,7 +81,9 @@ $(function(){ }); //End Booking Click function show_details(url_item){ - alert(url_item) + var menu_list = $('.menu_items_list'); + // menu_list.empty(); + // var row = ''; //Start Ajax $.ajax({ type: "GET", @@ -89,29 +91,32 @@ function show_details(url_item){ data: {}, dataType: "json", success: function(data) { - + menu_items = data.menu_items; for(var field in menu_items) { if (menu_items[field].item_instances){ - var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2); + console.log(menu_items[field].item_instances.price); + var price = parseFloat(menu_items[field].item_instances[0]).toFixed(2); }else{ var price = parseFloat(menu_items[field].price).toFixed(2); } - row = '
' +'
' +''+ menu_items[field].name +'' +'
' + +'
' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' +'
' + +'
' +''+ price +'' +'
'; - $(".menu_items_list").append(row); + $('.menu_items_list').append(row); } + } }); //end Ajax From be0af338a891d907955d3ff072a7c22955b55178 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 27 Jul 2017 15:13:13 +0630 Subject: [PATCH 07/10] update add oresr --- app/views/origami/addorders/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 8fdf0c32..07103225 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -112,7 +112,7 @@ function show_details(url_item){ +'
' +'
' - +''+ price +'' + +''+ menu_items[field].price +'' +'
'; $('.menu_items_list').append(row); } From 9b678b8523576cb9c7c9708c56cf6a5bbcec9124 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 27 Jul 2017 16:40:35 +0630 Subject: [PATCH 08/10] update add order menu category api --- .../menu_categories/show.json.jbuilder | 24 ++++++++--------- app/views/origami/addorders/show.html.erb | 27 ++++++++----------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder index c175be67..d7a6d581 100644 --- a/app/views/api/restaurant/menu_categories/show.json.jbuilder +++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder @@ -13,22 +13,22 @@ if @menu.menu_items if item.menu_item_instances.count == 1 then item_instance = item.menu_item_instances[0] - json.price = item_instance.price - json.is_available = item_instance.is_available - json.is_on_promotion = item_instance.is_on_promotion - json.promotion_price = item_instance.promotion_price - json.item_attributes = item_instance.item_attributes + json.price item_instance.price + json.is_available item_instance.is_available + json.is_on_promotion item_instance.is_on_promotion + json.promotion_price item_instance.promotion_price + json.item_attributes item_instance.item_attributes elsif item.menu_item_instances.count > 1 then json.item_instances item.menu_item_instances do |is| - json.item_instance_item_code = is.item_instance_code - json.item_instance_name = is.item_instance_name - json.price = is.price - json.is_available = is.is_available - json.is_on_promotion = is.is_on_promotion - json.promotion_price = is.promotion_price - json.item_attributes = is.item_attributes + json.item_instance_item_code is.item_instance_code + json.item_instance_name is.item_instance_name + json.price is.price + json.is_available is.is_available + json.is_on_promotion is.is_on_promotion + json.promotion_price is.promotion_price + json.item_attributes is.item_attributes end end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 07103225..3dff858e 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -15,18 +15,7 @@
- - +
@@ -96,14 +85,14 @@ function show_details(url_item){ for(var field in menu_items) { if (menu_items[field].item_instances){ - console.log(menu_items[field].item_instances.price); - var price = parseFloat(menu_items[field].item_instances[0]).toFixed(2); + console.log(menu_items[field].item_instances[0]); + var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2); }else{ var price = parseFloat(menu_items[field].price).toFixed(2); } row = '
' - +'
' + +'
' +''+ menu_items[field].name +'' +'
' @@ -112,7 +101,7 @@ function show_details(url_item){ +'
' +'
' - +''+ menu_items[field].price +'' + +''+ price +'' +'
'; $('.menu_items_list').append(row); } @@ -127,6 +116,12 @@ function show_details(url_item){