shopify-gold 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae3534c766c64f75ddc836965f6ed350122bff113449ebd0d6cf36ca3490a10
-  data.tar.gz: e6334c900e2fead3533daf82accdb295a7322e45703b7f7378c17b02d7f310d9
+  metadata.gz: 80643acee44a7474c72b7286d4875e30a6a15d2dfc7755e69b06d1efdf71ebd9
+  data.tar.gz: d33356b33692267a6c29ea31554f5c99a11a5c01fe8504a291e2a94485a52e30
 SHA512:
-  metadata.gz: d6e88dbb63de80478f8ed5c25b645571de75def9f1378b1e8f7729c9a32d2d508223507332441c7687600fc8c26674b993896399046545e5939546f5eb9fdc1a
-  data.tar.gz: 0244c687235812af8951ac46e9bc7e4d1938340984886a3540c0531e579b237d4e62fff74ce7cbbb1310d31955fee1c044d75d6bf2ffd4da50e53670951d64f1
+  metadata.gz: ffd0c44af7c2b7dbab2e9f79b19ede308fa0e30cab8e0e7c1317e27c48ad8b241898797c645e026d17a6ef17c4ab48d3d030ab5dfdd943305563a68390f48f00
+  data.tar.gz: 7e5e8038e53f66fdeb7fc88b977e9834044df9fce4243f4b77ffe9e15937646462237ec10f88b0cf2416e02f9f97fab77eea0fbed6079a7765e26bd63c6e0e8c

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

@@ -1,5 +1,6 @@
 module Gold
   module Admin
+    # Controller for referrals
     class ReferralsController < AdminController
       def create
         referral = Referral.new(referral_params)
@@ -11,7 +12,7 @@ module Gold
           flash[:danger] = "Failed to create, #{message}"
         end
 
-        redirect_to  "#{request.path}/#{referral.id}"
+        redirect_to "#{request.path}/#{referral.id}"
       end
 
       def update
@@ -37,6 +38,17 @@ module Gold
         redirect_to gold_admin_engine.referrals_path
       end
 
+      def add_billing
+        referral = Referral.find_by(id: params[:referral_id])
+        billing = Billing.find(params[:id])
+
+        billing.update(referral: referral)
+
+        flash[:success] = "Updated referral"
+
+        redirect_back(fallback_location: "/admin")
+      end
+
       private
 
       def referral_params

data/app/controllers/gold/billing_controller.rb

@@ -42,17 +42,7 @@ module Gold
     def tier
       billing # Expose the @billing variable to the view
 
-      # Apply a referral tracking. Don't overwrite an existing code
-      if !billing.referral && session[:gold_referral_id]
-        referral = Gold::Referral.find_by(id: session[:gold_referral_id])
-
-        if referral
-          billing.referral = referral
-          billing.update(
-            discount_percentage: referral.discount_percentage || 0
-          )
-        end
-      end
+      apply_referral_cookie
 
       @tiers = Tier.visible
     end
@@ -204,6 +194,29 @@ module Gold
       end
     end
 
+    def apply_referral_cookie
+      reference_id = :gold_referral_id
+      referral_tracking = cookies[reference_id]
+
+      # Remove the cookie for future use
+      cookies.delete(reference_id)
+
+      # Don't continue if billing already has a referral or there's no tracking code
+      return if billing.referral || !referral_tracking
+
+      # Find the referral by ID
+      referral = Gold::Referral.find_by(id: referral_tracking)
+
+      # Don't continue if that referral code wasn't found
+      return unless referral
+
+      # Apply the referral to the billing object
+      billing.referral = referral
+      billing.update(
+        discount_percentage: referral.discount_percentage || 0
+      )
+    end
+
     # Ensure that the current merchant is in one of the provided states or
     # redirect to the app's root URL.
     def ensure_billing_is(*states)

data/app/controllers/gold/referrals_controller.rb

@@ -4,7 +4,7 @@ module Gold
     def track
       referral = Referral.find_by(code: params[:code])
 
-      session[:gold_referral_id] = referral.id if referral
+      cookies[:gold_referral_id] = { value: referral.id, expires: 30.days } if referral
 
       redirect_to Gold.configuration.referral_redirect_url
     end

data/app/models/gold/referral.rb

@@ -20,4 +20,4 @@ module Gold
       self.code = code.parameterize.underscore.upcase
     end
   end
-end
+end

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

@@ -0,0 +1,29 @@
+<div class="card mb-3">
+  <div class="card-header">
+    <strong>Referral</strong>
+  </div>
+  <div class="card-body">
+    <aside class="float-right">
+      <a data-toggle="collapse" href="#collapseReferral">Change</a>
+
+      <div id="collapseReferral" class="collapse mt-3">
+        <%= form_tag(gold_admin_engine.add_billing_referral_path) do %>
+          <select name="referral_id">
+            <option value="">None</option>
+            <%= Gold::Referral.all.each do |referral| %>
+              <option value="<%= referral.id %>" <% if billing.referral&.id == referral.id %>selected<% end %>><%= referral.code %></option>
+            <% end %>
+          </select>
+
+          <input type="submit" class="btn btn-primary btn-sm" value="Update">
+        <% end %>
+      </div>
+    </aside>
+
+    <% if billing.referral %>
+      <%= link_to(@shop.billing.referral.code, admin_referral_path(@shop.billing.referral)) %>
+    <% else %>
+      <p>No referral</p>
+    <% end %>
+  </div>
+</div>

data/config/routes.rb

@@ -34,8 +34,9 @@ Gold::AdminEngine.routes.draw do
   end
 
   scope :referrals do
-    post "/", to: "admin/referrals#create", as: "referrals"
-    patch "/:id", to: "admin/referrals#update", as: "referral"
-    delete "/:id", to: "admin/referrals#delete", as: "delete_referral"
+    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"
+    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.1".freeze
+  VERSION = "4.0.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Andrew Smith
@@ -259,6 +259,7 @@ files:
 - app/views/gold/admin/billing/_tier.erb
 - app/views/gold/admin/billing/_trial_days.erb
 - app/views/gold/admin/referrals/_billings.erb
+- app/views/gold/admin/referrals/_card.erb
 - app/views/gold/admin/referrals/_delete.erb
 - app/views/gold/admin/referrals/_form.erb
 - app/views/gold/billing/_inner_head.html.erb