From a0c56f31c7756ccfe58034a5b48b9f4b91d5a534 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 30 Mar 2019 23:30:44 +0000 Subject: [PATCH 1/5] Move Google Analytics script from spree_frontend to ofn: this is one of the very last dependencies to spree_frontend code --- .../spree/shared/_google_analytics.html.erb | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 app/views/spree/shared/_google_analytics.html.erb diff --git a/app/views/spree/shared/_google_analytics.html.erb b/app/views/spree/shared/_google_analytics.html.erb new file mode 100644 index 0000000000..3098059e9c --- /dev/null +++ b/app/views/spree/shared/_google_analytics.html.erb @@ -0,0 +1,39 @@ +<% if tracker = Spree::Tracker.current %> + + <%= javascript_tag do %> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']); + _gaq.push(['_trackPageview']); + + <% if flash[:commerce_tracking] && @order.present? %> + <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %> + _gaq.push(['_addTrans', + "<%= j @order.number %>", + "", + "<%= @order.total %>", + "<%= @order.adjustments.tax.sum(:amount) %>", + "<%= @order.adjustments.shipping.sum(:amount) %>", + "<%= j @order.bill_address.city %>", + "<%= j @order.bill_address.state_text %>", + "<%= j @order.bill_address.country.name %>" + ]); + <% @order.line_items.each do |line_item| %> + _gaq.push(['_addItem', + "<%= j @order.number %>", + "<%= j line_item.variant.sku %>", + "<%= j line_item.variant.product.name %>", + "", + "<%= line_item.price %>", + "<%= line_item.quantity %>" + ]); + <% end %> + _gaq.push(['_trackTrans']); + <% end %> + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = '//google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + <% end %> +<% end %> From 25fd6f2e78e49ed36248994f4f254c4b429f1f02 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 30 Mar 2019 16:19:33 +0000 Subject: [PATCH 2/5] Move empty check template from spree_frontend, it is required from the checkout page This makes ofn code completely independent from spree_frontend views --- app/views/spree/checkout/payment/_check.html.erb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/views/spree/checkout/payment/_check.html.erb diff --git a/app/views/spree/checkout/payment/_check.html.erb b/app/views/spree/checkout/payment/_check.html.erb new file mode 100644 index 0000000000..e69de29bb2 From ffd883e84d5257bcd3fa100558ab411ced85af4a Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 30 Mar 2019 23:03:47 +0000 Subject: [PATCH 3/5] Remove dead code from usersregistration (signup calls are always ajax) and remove application.html.erb (spree frontend default layout) because this usersregistration was the last bit of OFN code to use it --- app/controllers/user_registrations_controller.rb | 3 --- app/views/layouts/application.html.erb | 1 - spec/controllers/user_registrations_controller_spec.rb | 8 -------- 3 files changed, 12 deletions(-) delete mode 100644 app/views/layouts/application.html.erb diff --git a/app/controllers/user_registrations_controller.rb b/app/controllers/user_registrations_controller.rb index e8e75dc5ee..2a3b3aaaa8 100644 --- a/app/controllers/user_registrations_controller.rb +++ b/app/controllers/user_registrations_controller.rb @@ -39,9 +39,6 @@ class UserRegistrationsController < Spree::UserRegistrationsController def render_error(errors = {}) clean_up_passwords(resource) respond_to do |format| - format.html do - render :new - end format.js do render json: errors, status: :unauthorized end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 4b8bfa1b1e..0000000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= render :file => 'spree/layouts/spree_application' %> diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb index 22d14b383f..bb725945d2 100644 --- a/spec/controllers/user_registrations_controller_spec.rb +++ b/spec/controllers/user_registrations_controller_spec.rb @@ -60,14 +60,6 @@ describe UserRegistrationsController, type: :controller do end end - context "when registration fails" do - it "renders new" do - spree_post :create, spree_user: {} - expect(response.status).to eq(200) - expect(response).to render_template "spree/user_registrations/new" - end - end - context "when registration succeeds" do context "when referer is not '/checkout'" do it "redirects to root" do From d9438cb08254b50fd9f5c01bfc7c995dc90a6bbc Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 30 Mar 2019 23:46:20 +0000 Subject: [PATCH 4/5] Add spinner.gif from spree_frontend, this makes ofn completely independent of spree_frontend assets --- app/assets/images/spinner.gif | Bin 0 -> 1533 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/spinner.gif diff --git a/app/assets/images/spinner.gif b/app/assets/images/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..877f43f662d3f764e6fb8785f2294b4d8c0656ae GIT binary patch literal 1533 zcmcJP+f!3#6ve-sBqs?8CpqB|4hOJF2$&)`DPRS4ItdVxaE)AKpg@x-f=Vk`nF{(4 zh+Kpuf}uzdDd93Dwnfxp726JYp~QhA)Y>{z92BL1+7ZPWd4UFn4*x*Em+x);)>?bd zR;Z%G!nGX00j~jg^ytyz;^N52NMB!{-EOy7ENN+J-QC?yO-EG;eN=H?28!ok78moHyVPfr&W71h+#Jb(UtVq)U{{rd|G3(L#P zuU@@+@ZiDx{5<&Io?w}oAWun-l&R&xn75iY{`$x%>A;fM8Su*9b(!3EFP;4wluVlO4&YGvhZ7@Bq-93}37v#>%I%ab@pqflH9dV77oiTLawL8c-Bo5*yshtC!|%4T?xNER+s zQtln;MTbzzcM#w~rxUAqWW+371-_03%K&35`un-rR3 zON;mH*E)i?%Q7R0y7{*7 zS?I1q<&0aRo;KR!o;U6of!IhWF80tvg|%97y+M96-G*B&I!$Aj6`k7BdbzRCTj&HE4ByGH#dB`Cq8H+juIvSxp!s;pLD^Or(X*AZa8s7w-c z%z$v(LV$zAg{v*Y-~UYsyFl#$7MenJur zWf~jT{9Dd-hq`TtA_(!K79g6+g>1bYChk5BdvYq7$1}__Gh-#m`2)`y`btcZzfD^)5fxwy4N=X!lI62gD zC_QuAR|&}73uv6Fu2dMD6-ck1@=H%8PSJ;<$rp5XvudCX)c}+gNxu^YW5`i=S2+*j zMw2icF(ICCz7ln1Aa2Lp$f^zO2v4g@whDB62Yi<*W>S=)+t-qJt~>wf&k{-pO}mSJ zuJB3uPOKjK;EIx{zYd4Y9{#Xg4=y&QMAe;W*P|MEWQt{iaN! zURwh8dU^Gv??;tgMyI^}5;x!b^pyJMd-rho2Smsk<=2`hq3P3OYLdLgVVD<(L8N|Z zSqw(4APX!~Ea=u)R9|ZVzo9-SsaV>@R+JP;yVgqMt%qc^`oYy-rd^pg=WWcw@y#-IT~e%J Date: Tue, 9 Apr 2019 17:15:24 +0100 Subject: [PATCH 5/5] Remove more dead code from usersregistration (signup calls are always ajax) --- .../user_registrations_controller.rb | 4 ---- .../user_registrations_controller_spec.rb | 20 ------------------- 2 files changed, 24 deletions(-) diff --git a/app/controllers/user_registrations_controller.rb b/app/controllers/user_registrations_controller.rb index 2a3b3aaaa8..787c8a9011 100644 --- a/app/controllers/user_registrations_controller.rb +++ b/app/controllers/user_registrations_controller.rb @@ -21,10 +21,6 @@ class UserRegistrationsController < Spree::UserRegistrationsController associate_user respond_to do |format| - format.html do - set_flash_message(:success, :signed_up_but_unconfirmed) - redirect_to after_sign_in_path_for(@user) - end format.js do render json: { email: @user.email } end diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb index bb725945d2..ae2f671a2e 100644 --- a/spec/controllers/user_registrations_controller_spec.rb +++ b/spec/controllers/user_registrations_controller_spec.rb @@ -59,24 +59,4 @@ describe UserRegistrationsController, type: :controller do cookies[:locale] = original_locale_cookie end end - - context "when registration succeeds" do - context "when referer is not '/checkout'" do - it "redirects to root" do - spree_post :create, spree_user: {email: "test@test.com", password: "testy123", password_confirmation: "testy123"}, :use_route => :spree - expect(response).to redirect_to root_path - expect(assigns[:user].email).to eq("test@test.com") - end - end - - context "when referer is '/checkout'" do - before { @request.env['HTTP_REFERER'] = 'http://test.com/checkout' } - - it "redirects to checkout" do - spree_post :create, spree_user: {email: "test@test.com", password: "testy123", password_confirmation: "testy123"}, :use_route => :spree - expect(response).to redirect_to checkout_path - expect(assigns[:user].email).to eq("test@test.com") - end - end - end end