shopify-gold 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2579432a51ad57061aac690c106fbd57a0dc212f1906ad276ef85c3df146f73f
-  data.tar.gz: a97f84bdc5c444e7ac9a5aa50ab5b30718513327ca832877f590f10d332700e3
+  metadata.gz: bb97c64ad972eef6e38a08521221dd8d0172f06cedd150fa4addf052d8e0cc74
+  data.tar.gz: 9d49628b75fb14b48f0cd2b916a8597b6a01583555487e6128b3f99aff53e2b0
 SHA512:
-  metadata.gz: 61eeeaece030e7ec2776357d0bf5198cfc5934036da1de089e59044afc35e73abc59675428eca5050f8e31fb3b85133a33daca51b67f41d7b5866a3e51cbd7fc
-  data.tar.gz: 809eb35fd864c6db0a76217fee511ac0f87c929fae66379f5d48b9b6af85727f4211083a3dc06f913c6e5cff3517eb5a62050b5e25e6079661a6ebceba968318
+  metadata.gz: 50d3f46f01f055dfccd98df99e282e6780b91631846dad208910cba9926c18188563f78e7f356af0bb1de41f7203c2e28be3bc8b606ff7c74edc513f02d85dad
+  data.tar.gz: e2cbfb96633d0c9a253ce7a8c0f6cf13ad035d2632dc8359c47ca5be71c4c5ab67cbc0c2fb686ca3d9585c5b70e3d152b2792f7fef28b64d30030bc8f5212f52

data/app/controllers/gold/admin/referrals_controller.rb

@@ -40,7 +40,7 @@ module Gold
 
       def add_billing
         referral = Referral.find_by(id: params[:referral_id])
-        billing = Billing.find(params[:id])
+        billing = Billing.find(params[:billing_id])
 
         billing.update(referral: referral)
 

data/app/controllers/gold/billing_controller.rb

@@ -42,7 +42,7 @@ module Gold
     def tier
       billing # Expose the @billing variable to the view
 
-      apply_referral_cookie
+      apply_referral_cookie unless billing.tier
 
       @tiers = Tier.visible
     end

data/app/views/gold/admin/referrals/_card.erb

@@ -8,6 +8,7 @@
 
       <div id="collapseReferral" class="collapse mt-3">
         <%= form_tag(gold_admin_engine.add_billing_referral_path) do %>
+          <input type="hidden" name="billing_id" value="<%= billing.id %>">
           <select name="referral_id">
             <option value="">None</option>
             <%= Gold::Referral.all.each do |referral| %>

data/app/views/gold/admin/referrals/_form.erb

@@ -1,16 +1,17 @@
 <%= form_for(referral, url: referral.new_record? ? gold_admin_engine.referrals_path : gold_admin_engine.referral_path(referral.id)) do |f| %>
   <div class="form-group">
-    <label>Full name</label>
+    <label>Contact name</label>
     <%= f.text_field :contact_name, class: "form-control" %>
   </div>
 
   <div class="form-group">
-    <label>Email</label>
+    <label>Contact email</label>
     <%= f.email_field :contact_email, class: "form-control" %>
   </div>
 
   <div class="form-group">
     <label>Company</label>
+    <p class="text-muted">Note: if left blank, merchant won't see a "Be sure to thank company" message.</p>
     <%= f.text_field :company, class: "form-control" %>
   </div>
 

data/config/routes.rb

@@ -36,7 +36,7 @@ Gold::AdminEngine.routes.draw do
   scope :referrals do
     post    "/", to: "admin/referrals#create", as: "referrals"
     patch   "/:id", to: "admin/referrals#update", as: "referral"
-    post    "/:id/billings", to: "admin/referrals#add_billing", as: "add_billing_referral"
+    post    "/billings", to: "admin/referrals#add_billing", as: "add_billing_referral"
     delete  "/:id", to: "admin/referrals#delete", as: "delete_referral"
   end
 end

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "4.0.3".freeze
+  VERSION = "4.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Helium's approach to billing for Shopify apps