index.html.haml in artfully_ose-1.2.0.pre.17

- old
+ new

@@ -17,11 +17,11 @@
               %li
                 = link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal'
               %li
                 = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
               %li
-                = link_to "Change Membership", "#change", 'data-toggle' => 'modal'
+                = link_to "Change Membership", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
               %li
                 = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal'
       .span6.right
         = icon_link_to("View Record", person_path(@person), 'icon-share-alt', 'btn', '')
         = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
@@ -39,14 +39,14 @@
               %th.right Price Paid
               %th.right Fee
           %tbody
             - @person.memberships.each do |membership|
               %tr
-                %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false
+                %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
                 %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
-                %td=l membership.starts_at, :format => :slashed_date
-                %td=l membership.ends_at, :format => :slashed_date
+                %td.starts-at=l membership.starts_at, :format => :slashed_date
+                %td.ends-at=l membership.ends_at, :format => :slashed_date
                 %td.price.right=number_as_cents membership.sold_price
                 %td.fee.right TODO
 
       #extend.modal
         .modal-header
@@ -70,55 +70,67 @@
         %p="#{@person} will receive a full refund for these memberships"  
       .modal-footer
         =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
 
-    #change.modal
-      =form_tag "#", :class => "form-horizontal", :method => :post do
+    #change.modal{'ng-controller' => 'ChangeMembershipController'}
+      =form_tag person_membership_changes_path, :class => "form-horizontal", 'novalidate' => 'novalidate', 'name' => 'changeForm', :method => :post do
         .modal-header
           .close{'data-dismiss'=>'modal'} x
           %h3 Change Membership
         .modal-body
           .control-group
-            %label.control-label="Membership Type"
+            %label.control-label="Selected Memberships"
             .controls
-              = select_tag :membership_type, options_from_collection_for_select(@membership_types, 'id', 'name')
+              %ol
+                %li{'ng-repeat' => 'membership in selected'}
+                  = hidden_field_tag('membership_ids[]', '{{membership.id}}')
+                  = '{{membership.type}} - {{membership.price}}'
+          .control-group
+            %label.control-label="New Membership Type"
+            .controls
+              = select_tag :membership_type_id, options_for_membership_types(@membership_types, include_price: true)
 
           .control-group
-            %label.control-label Price per membership
+            %label.control-label Price Per Membership
             .controls
-              .input-prepend
-                %span.add-on $
-                = text_field_tag :sold_price, "", :class => 'span1'
+              = text_field_tag :price, '0', :class => 'span1 currency', 'ng-model' => 'price', 'ng-change' => 'updateTotal()'
 
-          #payment-controls.controls
-            %label.radio
-              = radio_button_tag(:payment_method, :cash, true, :class => 'payment-method', :humanized_value => 'Cash')
-              Cash
-            %label.radio
-              = radio_button_tag(:payment_method, :comp, false, :class => 'payment-method', :humanized_value => 'Comp')
-              Comp
-            %label.radio
-              = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :humanized_value => 'Credit card')
-              Credit
+          .control-group
+            %label.control-label Total Price
+            .controls
+              = text_field_tag 'total', '', :class => 'span1', :disabled => 'disabled', 'ng-model' => 'total'
 
-          #payment-info.hidden.well
+          .control-group
+            %label.control-label Payment Method
+            #payment-controls.controls
+              %label.radio
+                = radio_button_tag(:payment_method, :cash, true, :class => 'payment-method', :humanized_value => 'Cash', 'ng-model' => 'payment_method')
+                Cash
+              %label.radio
+                = radio_button_tag(:payment_method, :comp, false, :class => 'payment-method', :humanized_value => 'Comp', 'ng-model' => 'payment_method')
+                Comp
+              %label.radio
+                = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :humanized_value => 'Credit card', 'ng-model' => 'payment_method')
+                Credit
+
+          #payment-info.well{'ng-show' => "'credit_card_manual' == payment_method"}
             .control-group
-              %label.control-label="Name on Card"
-              .controls= text_field_tag("credit_card[name]", params[:cardholder_name])
+              %label.control-label='Name on Card'
+              .controls= text_field_tag('credit_card_info[name]')
             .control-group
-              %label.control-label="Card Number"
-              .controls= text_field_tag("credit_card[number]", params[:card_number])
+              %label.control-label='Card Number'
+              .controls= text_field_tag('credit_card_info[number]')
             .control-group
-              %label.control-label="Expiration Date"
+              %label.control-label='Expiration Date'
               .date_field.controls
-                = select_tag("credit_card[month]", options_for_select(1..12, params["month"]), :class => 'input-small inline')
-                = select_tag("credit_card[year]", options_for_select(Time.now.year..Time.now.year + 10, params["year"]), :class => 'input-small inline')
+                = select_tag('credit_card_info[month]', options_for_select(1..12), :class => 'input-small inline')
+                = select_tag('credit_card_info[year]', options_for_select(Time.now.year..Time.now.year + 10), :class => 'input-small inline')
 
-      .modal-footer
-        =link_to "Process Membership Change", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+        .modal-footer
+          = submit_tag "Process Membership Change", :class => "btn btn-success"
+          =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
 
     #partial-refund.modal
       .modal-header
         .close{'data-dismiss'=>'modal'} x
         %h3 Refund Membership
@@ -139,17 +151,5 @@
       .modal-body
         %p="These memberships will be cancelled."  
       .modal-footer
         =link_to "Cancel Memberhships", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
-
--content_for :custom_js do
-  :javascript
-    $(".payment-method").change(function(){
-      if($(this).attr('value') != 'credit_card_manual'){
-        $("#payment-info").addClass("hidden");
-        $("#credit_card_number").val("")
-        $("#credit_card_name").val("")
-      } else {
-        $("#payment-info").removeClass("hidden");
-      }
-    });
\ No newline at end of file