artfully_ose 1.2.0.pre.8 → 1.2.0.pre.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2U1Njk3MDg2YWQyMzMzNDg0ODQwMmVlZjRiMDAxZDNkMDc3NWQ3Zg==
+    MGVjMmI2YmJlZWYwYjExYjE4MjhhNjUxNzRjMWNhM2U4ZGQ4ZmY1YQ==
   data.tar.gz: !binary |-
-    OGU0NjI2ZGVjZmNkY2E2MWYzM2RiYWUxMjdjZTFhMmZlZmI5ZGZiZg==
+    NGI3YjdjMTg2ODgwMzk1MDg4MjkzMjIyOTdkYzFhM2JiZWIwZjI0Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzNkMzk2OWY1ZjY1YzQxNWJlNmU1NWMwNDVjOWU2MzMzMDkxNzFiMTk1YmNl
-    NjRiMDBkZTUwODIxMTUxZDMzZmJiZGE0ZTJlNzIwNzBiNjg0MWIzNTEyNzk5
-    ODBmMDJhMTQxMDU5ZWM0ODMxODBhNWUyOWMxNmNiMmEwOTFkYTE=
+    NjZhZWRlOTRlMDQxNjdhNzVmMmUyOTUwYTc3MTZmZjYwYmM2MjYzYWJlZWEy
+    ZjZkMzAwN2M4NTc3YTc1MjE5ZTU4YjhlZWNhY2ZjNzIyMTNiMDc3NWM2ZjUx
+    MDNiNjZmZTMwM2U2NmJkZTZiNmU4NmJlYjkzYzNmNTgwM2EyODE=
   data.tar.gz: !binary |-
-    ZmQyYWU3ZTA5NzM4M2E3MWM5YjRmZDAwZDQ1NTdlZWRhY2NiM2QyZGIzYWJk
-    ODRkNDA4YjFhMDNjOTMzNjc5MGYxOGJiMGE0ZjUxNTkzYmI4ZmMxNDUzOGQ1
-    MGNmOWU1YmRjYzEyNmRhZTIxNDM1NGI4NTk1MjMzNTQ4MjJlOWY=
+    YTA5YTgwODY5MDdlMjljOWU0YTc4ZWJlZDU0YTc0ODFkOTUzMWFlZmM5Nzk3
+    MTg5ZDYyMGExOGE1YzU2NGI4YjU4YzA5MmVhZmUxNWE5NzJjMDg3YTAzOTQ5
+    MzE0MzBiMzE2NDAwZGFjYTNjZjBmMDMyZGQ0ZTAyOTBhMDIyNzI=

data/app/controllers/membership_types_controller.rb

@@ -20,6 +20,13 @@ class MembershipTypesController < ArtfullyOseController
     @membership_type = MembershipType.find(params[:id])
   end
 
+  def update
+    @membership_type = MembershipType.find(params[:id])
+    @membership_type.update_attributes(params[:membership_type])
+    flash[:notice] = "Your changes have been saved"
+    redirect_to membership_types_path
+  end
+
   private
     def with_type_selected
       render :type and return if params[:type].blank?

data/app/controllers/memberships_controller.rb

@@ -17,7 +17,7 @@ class MembershipsController < ArtfullyOseController
     def extend_memberships(params)
       
       #I hate how these are tied to the button text
-      if params[:commit].eql? "Extend Memberships"
+      if params[:commit].eql? "Change Expiration"
         params[:membership_ids].each do |membership_id|
           Membership.find(membership_id).adjust_expiration_to(params[:ends_at])
         end

data/app/controllers/store/checkouts_controller.rb

@@ -29,6 +29,11 @@ class Store::CheckoutsController < Store::StoreController
     redirect_to store_order_path
   end
 
+  def dook
+    @order = Order.find(154)
+    render :thanks
+  end
+
   def filter(params)
     filters = Rails.application.config.filter_parameters
     f = ActionDispatch::Http::ParameterFilter.new filters

data/app/views/membership_types/_form.html.haml

@@ -1,5 +1,5 @@
 =form_for @membership_type, :as => :membership_type, :html => { :class => 'form-horizontal' } do |f|
-  =f.hidden_field :type, :value => params[:type]
+  =f.hidden_field :type, :value => @membership_type.type
   %fieldset
     .control-group
       = f.label :name, "Name", :class => 'control-label'
@@ -32,4 +32,8 @@
         = f.check_box :on_sale
     .form-actions
       =f.submit "Save", :class => "btn btn-primary"
-      =link_to "Cancel", "", :class => "btn"
+      =link_to "Cancel", membership_types_path, :class => "btn"
+
+-content_for :custom_js do
+  :javascript
+    touchCurrency();

data/app/views/memberships/index.html.haml

@@ -48,6 +48,19 @@
                 %td.price.right=number_as_cents membership.sold_price
                 %td.fee.right TODO
 
+      #extend.modal
+        .modal-header
+          .close{'data-dismiss'=>'modal'} x
+          %h3 Change Expiration
+        .modal-body
+          .control-group
+            %label Change the expiration of these memberships to:
+            .controls
+              =text_field_tag "ends_at", "", :class => "datepicker"
+        .modal-footer
+          =submit_tag "Change Expiration", :class => "btn btn-success"
+          =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
+
     #full-refund.modal
       .modal-header
         .close{'data-dismiss'=>'modal'} x
@@ -128,19 +141,6 @@
         =link_to "Cancel Memberhships", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
 
-    #extend.modal
-      .modal-header
-        .close{'data-dismiss'=>'modal'} x
-        %h3 Change Expiration
-      .modal-body
-        .control-group
-          %label Change the expiration of these memberships to:
-          .controls
-            =text_field_tag "ends_at", "", :class => "datepicker"
-      .modal-footer
-        =submit_tag "Change Expiration", :class => "btn btn-success"
-        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
-
 -content_for :custom_js do
   :javascript
     $(".payment-method").change(function(){

data/app/views/store/checkouts/thanks.html.haml

@@ -45,10 +45,19 @@
             -unless @order.memberships.empty?
               %h4 Memberships
               %table.table
-                -current_cart.memberships.each do |membership|
+                -@order.memberships.each do |item|
                   %tr
-                    %td=membership.membership_type.membershipize
-                    %td.right=number_as_cents membership.membership_type.price
+                    %td=item.product.membership_type.membershipize
+                    %td.right=number_as_cents item.product.membership_type.price
+              .membership-message
+                .center{:style => 'text-align:center'}
+                  =icon_tag "18-envelope@2x", {:align => "center"}
+                .center{:style => 'text-align:center'}
+                  %h4 Thanks for becoming a member!
+                .message
+                  We've sent an email to
+                  %b=@order.person.email
+                  and that email includes instructions to setup your login and password so you can access our exclusive member site. Purchase member tickets, find exclusive member events, update your address, and more!
 
             -unless @order.donations.empty?
               %h4 Donations

data/config/routes.rb

@@ -32,7 +32,10 @@ Rails.application.routes.draw do
   namespace :store do
     resources :events, :only => :show, :as => :old_storefront_event
     resources :shows, :only => :show
-    resource :checkout, :only => :create
+    # resource :checkout, :only => :create
+    resource  :checkout, :only => :create do
+      get "dook", :to => "checkouts#dook"
+    end
   end
 
   devise_for :members, :controllers => { :invitations => "members/invitations" }

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.8"
+  VERSION = "1.2.0.pre.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.8
+  version: 1.2.0.pre.9
 platform: ruby
 authors:
 - Artful.ly