effective_products 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd6de56034ed84b15b02ab52785db58b37b0839e67a0db8cf31b77da8f4db148
-  data.tar.gz: e7a59c34d1c681a582c7c7c510ad9cc8c8f911e7bfbe339864678bca3f4db4d7
+  metadata.gz: 57266684ebdd641086150769be175ade40a9fb2761655a9d0c83ee04c233b750
+  data.tar.gz: 7770a4aaebaaf1048c5ef8cba5a4b56c6bd791a39402ff2877464407a6e5019f
 SHA512:
-  metadata.gz: 4383a40c636b788b989b22a8dedbc8d7afac6be72313ec737d3fe3ea1457365054194f99739651e3d61cacfa5a412e3aaa0d7068c39bfa3d41819446a226119f
-  data.tar.gz: b33a258e854dfdd4211edfb7143105d1c6af606cd8274886c548e65e414919a0d41e651cbd07e8399e497e2b06e9137f695cc053e43acf4509b663b01149f1de
+  metadata.gz: 30d1a478d0569578fb665ad6dcbee2c3c6c59cb14f1222fac9c123c60526fb35cb7acf3ac9c2dc48d6a141db56bd491646f31a70cfed4acd6142eac00bc2a728
+  data.tar.gz: f2b66599466397300d83108fbe6c0ce3584c023fcf54b6db260754c338c873af36f259e12dbdadd752ae175597e6426aa5bd51645fa49c8932ce0135a9ef4846

data/app/helpers/effective_products_helper.rb

@@ -1,3 +1,2 @@
 module EffectiveProductsHelper
-
 end

data/app/models/concerns/effective_products_ring_wizard.rb

@@ -15,14 +15,6 @@ module EffectiveProductsRingWizard
 
   module ClassMethods
     def effective_products_ring_wizard?; true; end
-
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
-    def required_wizard_steps
-      [:start, :billing, :checkout, :submitted]
-    end
   end
 
   included do
@@ -117,14 +109,7 @@ module EffectiveProductsRingWizard
   end
 
   def build_ring
-    ring = rings.build(
-      owner: owner,
-      first_name: owner.try(:first_name),
-      last_name: owner.try(:last_name),
-      email: owner.try(:email),
-      phone: owner.try(:phone)
-    )
-
+    ring = rings.build(owner: owner)
     address = owner.try(:shipping_address) || owner.try(:billing_address)
 
     if address.present?

data/app/models/effective/ring.rb

@@ -53,17 +53,5 @@ module Effective
       issued_at.present?
     end
 
-    # This is the Admin Save and Mark Paid action
-    def mark_paid!
-      raise('expected a blank ring payment') if ring_wizard.present?
-
-      save!
-
-      order = Effective::Order.new(items: self, user: owner)
-      order.purchase!(skip_buyer_validations: true, email: false)
-
-      true
-    end
-
   end
 end

data/app/views/effective/ring_wizards/_ring.html.haml

@@ -1,33 +1,40 @@
-= card('Ring') do
-  - ring = ring_wizard.ring
-  - owner = ring_wizard.owner
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= ring_wizard.wizard_step_title(:ring)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:ring)) if edit_effective_wizard?
 
-  %table.table.table-sm
-    %tbody
-      %tr
-        %th Owner
-        %td
-          = owner.to_s
-          - if owner.try(:email).present?
-            %br
-            = mail_to(owner.email)
+    - ring = ring_wizard.ring
+    - owner = ring_wizard.owner
 
-          - if owner.try(:phone).present?
-            %br
-            = owner.phone
+    %table.table.table-sm
+      %tbody
+        %tr
+          %th Owner
+          %td
+            = owner.to_s
+            - if owner.try(:email).present?
+              %br
+              = mail_to(owner.email)
 
-          - if owner.try(:membership).try(:number).present?
-            %br
-            Member Number #{owner.membership.number}
+            - if owner.try(:phone).present?
+              %br
+              = owner.phone
 
-      %tr
-        %th Address
-        %td= ring.shipping_address.to_html
+            - if owner.try(:membership).try(:number).present?
+              %br
+              Member Number #{owner.membership.number}
 
-      %tr
-        %th Metal
-        %td= ring.metal
+        %tr
+          %th Address
+          %td= ring.shipping_address.to_html
 
-      %tr
-        %th Size
-        %td Size #{ring.size}
+        %tr
+          %th Metal
+          %td= ring.metal
+
+        %tr
+          %th Size
+          %td Size #{ring.size}

data/app/views/effective/ring_wizards/_ring_wizard.html.haml

@@ -1,8 +1,3 @@
 .effective-ring-payment
-  - blacklist = ring_wizard.class.required_wizard_steps + [:summary]
-  - steps = ring_wizard.required_steps - blacklist
-
-  = render "effective/ring_wizards/summary", ring_wizard: ring_wizard
-
-  - steps.select { |step| ring_wizard.has_completed_step?(step) }.each do |partial|
+  - ring_wizard.render_steps.each do |partial|
     = render "effective/ring_wizards/#{partial}", ring_wizard: ring_wizard, step: partial

data/app/views/effective/ring_wizards/submitted.html.haml

@@ -9,6 +9,7 @@
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
+  = render 'effective/ring_wizards/summary', ring_wizard: resource
   = render 'effective/ring_wizards/ring_wizard', ring_wizard: resource
   = render 'effective/ring_wizards/orders', ring_wizard: resource
 

data/lib/effective_products/version.rb

@@ -1,3 +1,3 @@
 module EffectiveProducts
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Code and Effect