raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR changes - erb to haml, don't update en_GB translations

Browse Source
This commit is contained in:
stveep
2018-07-21 18:13:28 +01:00
parent b3da7049c6
commit c0f41b6833
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/payments/controllers/payment.js.coffee
View File

@@ -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()

4
app/overrides/spree/admin/payments/new/add_angular_to_form.html.erb.deface
View File

@@ -1,4 +0,0 @@
<!-- 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| %>

2
app/overrides/spree/admin/payments/new/add_angular_to_form.html.haml.deface Normal file
View File

@@ -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|

4
config/locales/en_GB.yml
View File

@@ -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'