Matt-Yorkley
3badaa07d2
Fix adjustment calculations; only "eligible" adjustments should be regarded as applied to an order.
...
When an order is submitted and the payment fails, the failed payment's adjustments (payment fees) are set to `eligible: false` to indicate they do not apply. These should not be counted as being included in an order's adjustments.
2020-08-19 22:50:37 +01:00
Luis Ramos
d6160b5759
Merge pull request #5758 from luisramos0/order_updater
...
Bring Order Updater from spree_core
2020-08-19 20:47:27 +01:00
Luis Ramos
40d4ed2c95
Merge pull request #5733 from luisramos0/base_ctrl
...
Move lib/spree to OFN
2020-08-19 18:35:17 +01:00
Maikel Linke
bb3f958dd2
Remove redundant includes
2020-08-19 10:37:18 +10:00
Luis Ramos
d1ef0e0a0b
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-18 16:41:29 +01:00
Matt-Yorkley
ed346b3b54
Add scrolling animate on sidebar hide
2020-08-17 13:41:06 +01:00
Matt-Yorkley
290120d015
Fix broken favicon path
...
Ensures the non-fingerprinted version of the favicon will be used directly from `/public/favicon.ico`. Needed after recent changes to the Rails asset pipeline.
2020-08-17 11:59:22 +01:00
Matt-Yorkley
0fd163602d
Rename method for clarity
2020-08-17 11:17:42 +01:00
Luis Ramos
f8146fb946
Adapt finders to rails 4
2020-08-16 16:50:54 +01:00
Matt-Yorkley
91789494b0
Fix error: Unpermitted attribute: order_cycle_ids
2020-08-15 17:03:19 +01:00
Matt-Yorkley
2eda8789d1
Add user id logging to OrderCycle an Schedule PaperTrail entries
2020-08-15 14:49:08 +01:00
Matt-Yorkley
5f8fc64b31
Move layout adjustment from view to CSS
2020-08-15 12:18:41 +01:00
Matt-Yorkley
102df28e97
Extract data masking to service
2020-08-14 20:48:33 +01:00
Matt-Yorkley
0b91991919
Add explanatory user message for viewing customer names
2020-08-14 20:48:33 +01:00
Matt-Yorkley
23bb72faa6
Add Enterprise shop preference to allow customer names in reports
2020-08-14 20:48:32 +01:00
Matt-Yorkley
ce5bcaaa20
Explicitly notify Bugsnag on checkout failure
2020-08-14 18:06:30 +01:00
Matt-Yorkley
de22ad0000
Fix flash error issues in checkout requests
2020-08-14 12:41:56 +01:00
Maikel Linke
b79c568b08
Load our spree overrides instead of the originals
...
We changed some of Spree's logic and want to use that. And once we
remove the spree_core gem, we need to load those files before using
them.
2020-08-14 15:38:00 +10:00
Maikel Linke
5761014205
Restore Spree customisations for controllers
2020-08-13 16:59:15 +10:00
Andy Brett
d46fad3a02
remove map reference
2020-08-12 12:33:15 -07:00
Andy Brett
c75a864ff2
link to the enterprise's shop instead of a full map
2020-08-12 12:21:07 -07:00
julesemmac
dee34d1f26
adding required argument to resolve Places error
2020-08-10 23:19:21 -04:00
Arun Kumar Mohan
13bf7497a9
Fix price translation in Bulk Order Management
2020-08-10 18:26:09 -05:00
Pau Pérez Fabregat
70e2fb759c
Merge pull request #5751 from luisramos0/subs_jobs
...
Add rescue statements with bugsnag alerts to subs jobs
2020-08-10 12:50:54 +02:00
Luis Ramos
49a60374e6
Remove dead method in payment method, it's a scope in OFN and remove unnecessary comments about spree
2020-08-07 14:14:46 +01:00
Luis Ramos
b21a969502
Fix new credit_card_spec
2020-08-07 13:45:25 +01:00
Luis Ramos
d746ae3d9e
Fix easy rubocop issues
2020-08-07 13:28:09 +01:00
Luis Ramos
621e2a3132
Run rubocop autocorrect
2020-08-07 13:16:38 +01:00
Luis Ramos
142bab8c35
Merge decorators with original spree files
2020-08-07 13:13:43 +01:00
Luis Ramos
abaa66cc14
Bring models from spree_core
2020-08-07 13:06:16 +01:00
Matt-Yorkley
1123e08a98
Update BugsnagJS to latest version and update initialization syntax
2020-08-07 12:59:33 +01:00
Luis Ramos
51a499d5c9
Revert rubocop autocorrect so that spec keeps working
2020-08-07 10:45:15 +01:00
Luis Ramos
086c521a27
Fix easy rubocop issues
2020-08-07 10:28:41 +01:00
Luis Ramos
7cefdda579
Run rubocop autocorrect
2020-08-07 10:21:09 +01:00
Luis Ramos
ba859111de
Merge decorators with original files brought from spree
2020-08-07 10:17:30 +01:00
Luis Ramos
fd9479f720
Bring modesl from spree_core
2020-08-07 10:06:08 +01:00
Luis Ramos
43e64f3555
Delete dead code
2020-08-06 01:41:28 +01:00
Luis Ramos
00ae3a25f7
Fix easy rubocop issues
2020-08-06 01:18:43 +01:00
Luis Ramos
14358256ed
Bring country, zone, state and zone_member from spree together with respective specs
2020-08-06 01:09:35 +01:00
Luis Ramos
f14bb280c1
Merge pull request #5680 from cillian/prevent-blank-open-street-map
...
If no enterprises have been geocoded yet make sure Open Street Map displays correctly
2020-08-05 20:27:40 +01:00
Luis Ramos
f093656c6b
Merge pull request #5763 from luisramos0/mailers
...
Bring Mailers from Spree and make order shipped email translatable
2020-08-05 18:09:12 +01:00
Luis Ramos
d8acf90240
Merge pull request #5770 from openfoodfoundation/revert-5601-enhancement/5454-links-to-shops-in-new-tabs
...
Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab"
2020-08-05 11:51:48 +01:00
Luis Ramos
6cc296926c
Merge pull request #5847 from rmklaus12/5579-missing-translation-subscriptions
...
5579 missing translation subscriptions
2020-08-05 11:29:34 +01:00
Luis Ramos
425901fa7a
Add some paragraphs and breaklines to the tempalte that used to be text and is now html
...
This template needs to be revisited, this is just a quick fix
2020-08-03 16:43:11 +01:00
Luis Ramos
6e57e1ad56
Fix conflict between unused Spree::CheckoutHelper in spree_core and the required ::CheckoutHelper in OFN
...
The OFN checkoutHelper was not being included and instead the Spree::CheckoutHelper, that doesnt have the necessary helpers, was used
2020-08-03 16:25:18 +01:00
Cillian O'Ruanaidh
e6ab2ae753
Remove unused positiveAngles and negativeAngles arrays from map centre calculator service.
...
I forgot to remove these when I was refactoring this earlier.
2020-08-03 15:12:40 +01:00
Eduardo
51f39ee89d
move coffee directive to partial
2020-08-02 20:01:49 -03:00
Luis Ramos
327d6c43d9
Merge pull request #4084 from openfoodfoundation/dependabot/bundler/devise-3.5.10
...
[Security] Bump devise from 2.2.8 to 3.5.10
2020-08-01 15:55:19 +01:00
Luis Ramos
cc7363d9e7
Merge pull request #5824 from luisramos0/improve_checkout
...
Reset order state to cart in case the stripe SCA authorization step fails
2020-08-01 15:53:41 +01:00
Cillian O'Ruanaidh
3c23952fd6
Don't double escape :open_street_map_provider_options so they are parsed into a JS object rather than a string.
...
Before if you entered '{ accessToken: secret }' into the open street map provider options field in the admin content settings the 'JSON.parse(openStreetMapConfig.open_street_map_provider_options)' call in the open_street_map directive was converting them into a string because they were double escaped. They need to be converted into a JS object in order to set the Leaflet provider options.
2020-07-31 20:08:09 +01:00
