raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,446 Commits 19 Branches 454 Tags
d4cfa0463fdef006f669c8684457938bd932c733
Commit Graph

10159 Commits

Author SHA1 Message Date
Luis Ramos
d4cfa0463f Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it. 2020-07-22 15:57:49 +01:00
Luis Ramos
0fe9d2ac09 Make OC advanced settings work by permitting the extra parameter 2020-07-22 15:57:49 +01:00
Luis Ramos
3d94ce39dd Merge pull request #5793 from luisramos0/payment_fees 
Make charges update method update the first pending payment
 2020-07-20 21:36:19 +01:00
Luis Ramos
21227d7482 Make charges update method update the first pending payment 
Updating the first overall payment could select a failed payment and ignore the pending payment that is about to be processed
 2020-07-20 18:23:06 +01:00
Luis Ramos
62a3b6b720 Merge pull request #5406 from kristinalim/fix/5300-optimistic_locking_in_stock_items 
5300 Avoid race conditions in Spree::StockItem
 2020-07-17 22:24:59 +01:00
Luis Ramos
152e432f78 Merge pull request #5749 from mbudm/issue/1253 
Ensure the hero image doesn't pixelate on hamburger menu open
 2020-07-17 22:15:46 +01:00
Maikel
4e3502cce7 Merge pull request #5766 from mkllnk/5764-fix-pin-payments 
5764 Provide credit card brand to Pin Payments
 2020-07-16 10:28:18 +10:00
Pau Perez
4e00c45782 Doc defensive coding needed by pin payments 
[skip ci]
 2020-07-15 16:46:09 +02:00
Luis Ramos
31e072179b Make method a little simple by extracting method 2020-07-15 15:23:16 +01:00
Matt-Yorkley
c009fed6be Update StrongParams for Pin Payments 2020-07-15 14:00:19 +02:00
Maikel Linke
25155cab18 Provide credit card brand to Pin Payments 
Spree replaced the Ruby code providing the credit card brand with a
jquery plugin providing it on the checkout screen.

I re-added Ruby code because it's easier and more robust than updating
the user interface with new Javascript.
 2020-07-15 17:13:46 +10:00
Steve Roberts
dbc7632c4e Add inline comment to explain two height properties 2020-07-15 09:52:04 +10: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
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
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
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
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
Luis Ramos
b096717172 Extract per_order_fees_total out of compute_order 2020-07-07 17:26:24 +01:00
Luis Ramos
21120dd6ab Extract per_item_fees_total out of compute_order 2020-07-07 17:26:24 +01:00
Luis Ramos
4b12a5f592 Extract line_items_total from compute_order 2020-07-07 17:26:24 +01:00
Luis Ramos
6a94168ee5 Remove Spree namespace from DefaultTax 2020-07-07 17:26:24 +01:00
Luis Ramos
5e8438c446 Move all calculators outside the spree namespace 2020-07-07 17:26:23 +01:00
Luis Ramos
9c3eb3725e Remove dead code related to promotions, we dont have promotions in OFN 2020-07-07 17:20:22 +01:00
Luis Ramos
a544102b1b Fix some rubocop issues 2020-07-07 17:20:22 +01:00
Luis Ramos
f2a46d2cef Merge decorators into original classes brought from spree_core 2020-07-07 17:20:22 +01:00
Luis Ramos
6b04df0dea Fix indentation and extract Calculator as a separate module declaration 2020-07-07 17:20:22 +01:00
Luis Ramos
c2898ba389 Bring calculators from spree_core 2020-07-07 17:20:22 +01:00
Luis Ramos
ce1114556d Merge pull request #5578 from mbudm/issue/3770-manual-update 
Update orders swagger spec and fix api_key access to orders endpoint
 2020-07-06 20:32:25 +01:00
Luis Ramos
761871c90e Merge pull request #5715 from luisramos0/ship_method 
Fix issue in Spree 2.1 and bring Spree::Stock classes to OFN 🎉
 2020-07-06 19:15:50 +01:00
Luis Ramos
ceac8a5d40 Merge pull request #5725 from Matt-Yorkley/admin-order-images 
Fix default image display in admin order edit
 2020-07-06 14:03:56 +01:00
Dany Marcoux
3dfabdc117 Filter orders on inclusive dates in admin/orders 
Closes #5555

Co-authored-by: Luis Ramos <luisramos0@gmail.com>
 2020-07-05 20:12:16 +02:00
Matt-Yorkley
96138e9129 Refactor UserLocaleSetter public methods 2020-07-04 10:15:35 +02:00
Matt-Yorkley
f08a530877 Make #valid_locale_for_user an instance method 2020-07-04 09:51:00 +02:00
Luis Ramos
ff9133b7aa Merge pull request #5699 from coopdevs/fix-order-button-radius 
Make button border radius consistent
 2020-07-03 23:01:14 +01:00
Luis Ramos
b917238d1e Merge pull request #5446 from luisramos0/sca_refunds 
Make StripeSCA void action work
 2020-07-03 22:45:35 +01:00
Matt-Yorkley
46c40bdf33 Fix default image display in admin order edit 2020-07-03 22:58:29 +02:00
Luis Ramos
a472b6525f Merge pull request #5707 from luisramos0/missing_spaces 
Add space after translations so that translators dont have to guess a space is needed
 2020-07-03 16:10:55 +01:00
Matt-Yorkley
05c1f093b2 Delete dead code 
There's nothing done in this bit of code that isn't already done somewhere else, and more effectively.
 2020-07-03 16:44:37 +02:00
Matt-Yorkley
0c2fd4bfd2 Fix ensure_valid_locale_persisted and change public interface of service 2020-07-03 16:39:24 +02:00
Luis Ramos
07a44cfaf3 Update selected shipping rate if there is an original shipping method to keep and it is different from the one selected through the Estimator process 
Make sure the shipment is saved (callbacks!) whenever the ship method has changed in the refresh_rates process
 2020-07-03 13:48:12 +01:00
Matt-Yorkley
ab63d2234c Guard against nils in conditions 2020-07-03 14:22:32 +02:00