Use save_bar on order cycle update form

app/views/admin/order_cycles/_form.html.haml

@@ -52,14 +52,12 @@
 .actions
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  - else
-    = f.submit 'Update', 'ng-click' => "submit(null)", 'ng-disabled' => '!loaded()'
-    = f.submit 'Update and Close', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  %span{'ng-show' => 'loaded()'}
-    or
-    = link_to 'Cancel', main_app.admin_order_cycles_path
-  %span{'ng-hide' => 'loaded()'} Loading...
-  = render 'spree/admin/shared/status_message'
+
+    %span{'ng-show' => 'loaded()'}
+      or
+      = link_to 'Cancel', main_app.admin_order_cycles_path
+    %span{'ng-hide' => 'loaded()'} Loading...
+    = render 'spree/admin/shared/status_message'
 
 
 - unless Rails.env.production?

app/views/admin/order_cycles/_simple_form.html.haml

@@ -23,12 +23,9 @@
 .actions
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  - else
-    = f.submit 'Update', 'ng-click' => "submit(null)", 'ng-disabled' => '!loaded()'
-    = f.submit 'Update and Close', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
 
-  %span{'ng-show' => 'loaded()'}
-    or
-    = link_to 'Cancel', main_app.admin_order_cycles_path
-  %span{'ng-hide' => 'loaded()'} Loading...
-  = render 'spree/admin/shared/status_message'
+    %span{'ng-show' => 'loaded()'}
+      or
+      = link_to 'Cancel', main_app.admin_order_cycles_path
+    %span{'ng-hide' => 'loaded()'} Loading...
+    = render 'spree/admin/shared/status_message'

app/views/admin/order_cycles/edit.html.haml

@@ -28,7 +28,8 @@
 
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
-  %save-bar{ save: "submit()", form: "order_cycle_form" }
+
+  %save-bar{ buttons: "[{text: 'Update', param: null}, {text: 'Update and Close', param: '#{main_app.admin_order_cycles_path}'}]", save: "submit(param)", form: "order_cycle_form" }
 
   - if order_cycles_simple_form
     = render 'simple_form', f: f

app/views/admin/variant_overrides/_products.html.haml

@@ -1,5 +1,5 @@
 %form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } }
-  %save-bar{ save: "update()", form: "variant_overrides_form" }
+  %save-bar{ save: "update()", form: "variant_overrides_form", buttons: "[{text: 'Save Changes'}]" }
   %table.index.bulk#variant-overrides
     %col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } }
     %col.product{ width: "20%", ng: { show: 'columns.product.visible' } }

app/views/spree/admin/orders/bulk_management.html.haml

@@ -10,7 +10,7 @@
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
 %div{ ng: { controller: 'LineItemsCtrl' } }
-  %save-bar{ save: "submit()", form: "bulk_order_form" }
+  %save-bar{ save: "submit()", form: "bulk_order_form", buttons: "[{text: 'Save Changes'}]" }
   .filters{ :class => "sixteen columns alpha" }
     .date_filter{ :class => "two columns alpha" }
       %label{ :for => 'start_date_filter' }