nimbleshop_splitable 0.0.10 → 0.0.11

data/app/controllers/nimbleshop_splitable/splitables_controller.rb

@@ -19,30 +19,16 @@ module NimbleshopSplitable
     end
 
     def update
-      respond_to do |format|
-        if @payment_method.update_attributes(post_params[:splitable])
-          format.js  {
-            flash[:notice] = "Splitable record was successfully updated"
-            render js: "window.location = '/admin/payment_methods'"
-          }
-        else
-          msg =  @payment_method.errors.full_messages.first
-          error =  %Q[alert("#{msg}")]
-          format.js { render js: error }
-        end
-      end
-    end
+      alert_msg = if @payment_method.update_attributes(post_params[:splitable])
+                    msg = "Record has been updated"
+                    %Q[alert("#{msg}")]
+                  else
+                    msg =  @payment_method.errors.full_messages.first
+                    %Q[alert("#{msg}")]
+                  end
 
-    def destroy
       respond_to do |format|
-        if @payment_method.destroy
-          format.js {
-            flash[:notice] = "Splitable record was successfully deleted"
-            render js: "window.location = '/admin/payment_methods'" #TODO hardcoded url
-          }
-        else
-          format.js { render js: 'Splitable record could not be deleted. Please try again later.' }
-        end
+        format.js { render js: alert_msg }
       end
     end
 

data/app/views/nimbleshop_splitable/splitables/_edit.html.erb

@@ -1,35 +1,53 @@
-<div class='payment-method-engine-well'>
-
-   <div>
-    <h2> Splitable </h2>
-
-     <div class="edit_link">
-       <%= link_to 'Edit', '#', class: "nimbleshop-payment-method-edit", id: "nimbleshop-splitable-payment-method-edit" %>
-       <%= link_to nimbleshop_splitable.splitable_path,  confirm: 'Do you really want to delete Authorize.net payment method',
-                   class: 'nimbleshop-payment-method-delete',
-                   method: :delete,
-                   remote: true do %>
-         <i class='icon-remove icon-white'></i>
-       <% end %>
-     </div>
-
-    <%= nimbleshop_splitable_picture_on_admin_payment_methods %>
-
-    <div class='clear'></div>
-  </div>
-
-  <%= render partial: '/nimbleshop_splitable/splitables/form' %>
-
-</div>
-
-<script>
-  $(function(){
-
-    $('#nimbleshop-splitable-payment-method-edit').toggle(function(){
-      $('#nimbleshop-splitable-form-well').show();
-    }, function(){
-      $('#nimbleshop-splitable-form-well').hide();
-    });
-
-  })
-</script>
+<% payment_method = NimbleshopSplitable::Splitable.first %>
+
+<%= content_tag :div, style: 'display:none', data: { behavior: "payment-method-form-#{payment_method.permalink}" } do %>
+
+  <div style="width:100px;margin-left:90px;"><%= nimbleshop_splitable_picture_on_admin_payment_methods %></div>
+  <br />
+
+
+  <%= form_for NimbleshopSplitable::Splitable.first,  url: '/nimbleshop_splitable/splitable',
+                                                      remote: true,
+                                                      html: { method: 'put',
+                                                              id: 'nimbleshop-splitable-form',
+                                                              class: 'nimbleshop-payment-method-form form-horizontal'} do |f| %>
+
+    <fieldset>
+      <div class="control-group">
+        <%= f.label :api_key, nil, class: 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :api_key, class: 'span6' %>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <%= f.label :api_secret, nil, class: 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :api_secret, class: 'span6' %>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <%= f.label :expires_in, nil, class: 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :expires_in, class: 'span6' %>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <div class="controls">
+          <label class='checkbox'>
+            <%= f.check_box :mode, {}, 'test', 'production' %> Enable test mode
+          </label>
+        </div>
+      </div>
+
+    </fieldset>
+
+    <div class="form-actions">
+      <%= link_to 'Disable', main_app.disable_admin_payment_method_path(payment_method), class: 'disable-payment-method-link', method: :put %>
+      &nbsp;
+      <%= f.submit('Submit', class: 'btn btn-primary') %>
+    </div>
+  <% end %>
+<% end %>

data/lib/nimbleshop_splitable/processor.rb

@@ -71,7 +71,7 @@ module NimbleshopSplitable
     end
 
     def do_purchase(options = {})
-      add_to_order(options, 'purchased')
+      record_transaction(options, 'purchased')
       order.update_attributes(payment_method: payment_method)
       order.purchase!
 
@@ -79,16 +79,15 @@ module NimbleshopSplitable
     end
 
     def do_void(options = {})
-      add_to_order(options, 'voided')
+      record_transaction(options, 'voided')
       order.update_attributes(payment_method: payment_method)
       order.void!
 
       true
     end
 
-    def add_to_order(params, operation)
+    def record_transaction(params, operation)
       order.payment_transactions.create(operation: operation,
-                                        success: true,
                                         transaction_gid: params[:transaction_id],
                                         params: params)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbleshop_splitable
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -44,7 +44,6 @@ files:
 - app/models/nimbleshop_splitable/splitable.rb
 - app/views/nimbleshop_splitable/payments/_new.html.erb
 - app/views/nimbleshop_splitable/splitables/_edit.html.erb
-- app/views/nimbleshop_splitable/splitables/_form.html.erb
 - config/routes.rb
 - lib/nimbleshop_splitable/engine.rb
 - lib/nimbleshop_splitable/gateway.rb
@@ -74,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1909870227371927329
+      hash: -2530981225204108230
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1909870227371927329
+      hash: -2530981225204108230
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/views/nimbleshop_splitable/splitables/_form.html.erb

@@ -1,47 +0,0 @@
-<div class='well nimbleshop-payment-method-form-well' id='nimbleshop-splitable-form-well' style='display:none;'>
-
-  <%= form_for NimbleshopSplitable::Splitable.first,  url: '/nimbleshop_splitable/splitable',
-                                                      remote: true,
-                                                      html: { method: 'put',
-                                                              id: 'nimbleshop-splitable-form',
-                                                              class: 'nimbleshop-payment-method-form form-horizontal'} do |f| %>
-
-    <fieldset>
-      <div class="control-group">
-        <%= f.label :api_key, nil, class: 'control-label' %>
-        <div class="controls">
-          <%= f.text_field :api_key, class: 'span6' %>
-        </div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :api_secret, nil, class: 'control-label' %>
-        <div class="controls">
-          <%= f.text_field :api_secret, class: 'span6' %>
-        </div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :expires_in, nil, class: 'control-label' %>
-        <div class="controls">
-          <%= f.text_field :expires_in, class: 'span6' %>
-        </div>
-      </div>
-
-      <div class="control-group">
-        <div class="controls">
-          <label class='checkbox'>
-            <%= f.check_box :mode, {}, 'test', 'production' %> Enable test mode
-          </label>
-        </div>
-      </div>
-
-    </fieldset>
-
-    <div class="form-actions">
-      <%= f.submit('Submit', class: 'btn btn-primary') %>
-      &nbsp;
-      <%= link_to t(:cancel), nimbleshop_splitable.splitable_path, class: 'cancel btn' %>
-    </div>
-  <% end %>
-</div>