diff --git a/app/assets/javascripts/admin/payments/controllers/payment.js.coffee b/app/assets/javascripts/admin/payments/controllers/payment.js.coffee index 73f717deeb..549ec365a1 100644 --- a/app/assets/javascripts/admin/payments/controllers/payment.js.coffee +++ b/app/assets/javascripts/admin/payments/controllers/payment.js.coffee @@ -4,7 +4,7 @@ angular.module("admin.payments").controller "PaymentCtrl", ($scope, Payment, Sta $scope.StatusMessage = StatusMessage $scope.submitPayment = () -> - return false if $scope.submitted == true + return false if $scope.submitted $scope.submitted = true StatusMessage.display 'progress', t("spree.admin.payments.source_forms.stripe.submitting_payment") Payment.purchase() diff --git a/app/overrides/spree/admin/payments/new/add_angular_to_form.html.erb.deface b/app/overrides/spree/admin/payments/new/add_angular_to_form.html.erb.deface deleted file mode 100644 index 6ace1ee579..0000000000 --- a/app/overrides/spree/admin/payments/new/add_angular_to_form.html.erb.deface +++ /dev/null @@ -1,4 +0,0 @@ - -<%= form_for @payment, :url => admin_order_payments_path(@order), - :html => {"ng-app" => "admin.payments", - "ng-controller" => "PaymentCtrl"} do |f| %> diff --git a/app/overrides/spree/admin/payments/new/add_angular_to_form.html.haml.deface b/app/overrides/spree/admin/payments/new/add_angular_to_form.html.haml.deface new file mode 100644 index 0000000000..b2c55d6a8b --- /dev/null +++ b/app/overrides/spree/admin/payments/new/add_angular_to_form.html.haml.deface @@ -0,0 +1,2 @@ +/replace 'code[erb-loud]:contains("form_for @payment")' += form_for @payment, :url => admin_order_payments_path(@order), :html => {"ng-app" => "admin.payments", "ng-controller" => "PaymentCtrl"} do |f| diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index e6c48f6529..d50003b209 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -2380,9 +2380,7 @@ en_GB: payments: source_forms: stripe: - error_saving_payment: Error saving payment - submitting_payment: Submitting payment... - + no_payment_via_admin_backend: Creating Stripe-based payments from the admin backend is not possible at this time products: new: title: 'New Product'