Luis Ramos
f66538d2cb
Convert test and shipment email templates to haml
2020-07-14 14:26:05 +01:00
Luis Ramos
55f160c309
Bring test and shipment email templates from spree_core
2020-07-14 14:23:09 +01:00
Luis Ramos
5162964936
Fix easy rubocop issues
2020-07-14 13:46:01 +01:00
Luis Ramos
d12495f3db
Merge decorators with original classes brought from spree and merge order_mailer specs
2020-07-14 13:38:11 +01:00
Luis Ramos
c6cd695b3c
Bring remaing mailers from spree_core
2020-07-14 13:28:11 +01:00
Steve Roberts
c4d7899a99
Use vh units for new browsers and align tagline bg to top.
2020-07-14 19:26:12 +10:00
Steve Roberts
3a722bc697
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/5072
2020-07-14 13:31:53 +10:00
Steve Roberts
60870a1215
Fix linting errors
2020-07-14 12:58:48 +10:00
Steve Roberts
63a080266e
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/1253
2020-07-14 12:45:14 +10:00
Luis Ramos
9c8318d828
Merge pull request #5613 from luisramos0/calculators
...
Move all Calculators from spree to OFN and out of the Spree namespace
2020-07-13 15:16:15 +01:00
Luis Ramos
d536cc8108
Merge pull request #5755 from Matt-Yorkley/groups-images
...
Fix StrongParameters for groups images
2020-07-13 14:50:24 +01:00
Luis Ramos
2070cfd5bb
Fix easy rubocop issues
2020-07-11 15:44:23 +01:00
Luis Ramos
aed384183b
Move Spree::OrderUpdater to OrderManagement engine
2020-07-11 15:44:23 +01:00
Luis Ramos
e453b130e4
Bring core/lib/spree/core/ext/active_record.rb to OFN and add it to Spree::Order, the only place where it is used
2020-07-11 15:44:23 +01:00
Luis Ramos
d4c48e2b94
Merge OrderUpdate Delegator into Spree::OrderUpdater
2020-07-11 15:44:23 +01:00
Luis Ramos
872cfcfc58
Remove unused promotions code
2020-07-11 15:44:23 +01:00
Luis Ramos
5b3fbe0aed
Merge decorator OrderUpdater
2020-07-11 15:44:23 +01:00
Luis Ramos
ebeeeb7ed3
Fix easy rubocop issues
2020-07-11 15:44:23 +01:00
Luis Ramos
7218bb0c7d
Bring Spree::OrderUpdater from spree
2020-07-11 15:44:23 +01:00
Luis Ramos
388d575cc8
Remove strong parameters and search helpers, they are not used in OFN
2020-07-11 15:41:26 +01:00
Luis Ramos
fdd21d7d7d
Fix easy rubocop issues
2020-07-11 15:41:26 +01:00
Luis Ramos
ab67a4f80c
Bring base controller from spree
2020-07-11 15:41:26 +01:00
Pau Perez
cf64d3a290
Merge skipped callback from decorator into model
...
If we don't want that callback we can just as well remove it now that we
own that code.
2020-07-10 15:07:12 +02:00
Pau Perez
55d52b875f
Run rubocop autocorrect on payment model
2020-07-10 15:04:29 +02:00
Luis Ramos
5afb862ce1
Extract setup and authorize to a new method called prepare_for_payment to fix rubocop ABCsize issue
...
It looks like this rubocop rule weights a raise over a return...
2020-07-10 13:14:07 +01:00
Pau Perez
6389fdb16e
Simplify code related to error handling
2020-07-10 13:14:07 +01:00
Luis Ramos
01ab974a3b
Add rescue statment to failed payment email so that the processing of other orders continues if there is a problem while sending the email
2020-07-10 13:14:07 +01:00
Luis Ramos
7a9f9a5624
Log bugsnag and still send failed payment email when any exception is caught during the confirmation process
2020-07-10 13:14:05 +01:00
Pau Perez
d8b748a851
Merge alias_method method and its original version
2020-07-10 10:41:44 +02:00
Pau Perez
d49068ce66
Move method delegation from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
cf6138da66
Replace model method with its decorated version
2020-07-10 10:41:44 +02:00
Pau Perez
3fb6193098
Move adjustments logic from decorator into model
2020-07-10 10:41:44 +02:00
Pau Perez
861726200c
Move localize_number from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
48910aeb77
Move #refund! to the processing.rb
2020-07-10 10:41:44 +02:00
Pau Perez
6d9a518616
Move method from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
322c4d0f3f
Move decorator's callbacks to model
2020-07-10 10:41:44 +02:00
Pau Perez
9935df9f2d
Move Pin payment method from decorator into model
2020-07-10 10:41:44 +02:00
Pau Perez
06aa56164f
Bring in Payment model from Spree
2020-07-10 10:41:44 +02:00
Luis Ramos
cc3361aaac
Merge pull request #5659 from dmarcoux/issue-5555
...
Filter orders on inclusive dates in admin/orders
2020-07-09 20:40:45 +01:00
Matt-Yorkley
1a132924d2
Fix StrongParameters for groups images
2020-07-09 10:00:02 +02:00
Luis Ramos
5648b2e281
Add rescue statements to subs jobs so that when an order placement or confirmation fails, there's a bugsnag alert for it and the job continues processing the rest of the orders
2020-07-08 18:41:14 +01:00
Steve Roberts
2f562809c0
Ensure the hero image doesn't attempt to use the full height of all page content
...
Not sure exactly why this happens, but when the mobile nav is opened the hero image at #tagline:before uses the height of the full window - often around 4000px. Adding max-height of 100% to the nearest safe parent prevents this behaviour.
2020-07-08 21:31:52 +10:00
Matt-Yorkley
d78db16abe
Merge pull request #5718 from Matt-Yorkley/available-locales-bug
...
Available locales bug
2020-07-08 12:30:18 +02:00
Steve Roberts
7e195c3856
Add redirect to shop on order cycle change
2020-07-08 20:18:21 +10:00
Steve Roberts
eda9293619
Change to new directive that prevents enter default and blurs the input field
2020-07-08 19:19:46 +10:00
Luis Ramos
0b79e7c48c
Fix rubucop issue in enterprise_fee model
2020-07-07 17:26:24 +01:00
Luis Ramos
d92f97716a
Extract compute_for and thus resolve the rubocop complexity issue
2020-07-07 17:26:24 +01:00
Luis Ramos
68359d4d1a
Remove unnecessary variable (this sum and += come from the original
...
spree code and is not necessary here now)
2020-07-07 17:26:24 +01:00
Luis Ramos
70432e301d
Early exit if max is zero to make method shorted
2020-07-07 17:26:24 +01:00
Luis Ramos
fbe0a3246d
Extract applicable_rate? and thus resolve rubocop complexity issue
2020-07-07 17:26:24 +01:00
