raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,401 Commits 19 Branches 452 Tags
efacca62926f443e8bdc0a87fbe4946844bbf6fa
Commit Graph

10131 Commits

Author SHA1 Message Date
Luis Ramos
efacca6292 Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab" 2020-07-15 15:33:03 +01: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
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
Matt-Yorkley
078726dcca Add explanatory comment on saving selected locale in cookies 2020-07-03 14:21:45 +02:00
Matt-Yorkley
dab0add492 Make conditional more concise 2020-07-03 14:20:51 +02:00
Matt-Yorkley
ebffa381c6 Update cookies[:locale] logic 2020-07-03 14:06:05 +02:00
Matt-Yorkley
faa7c0a7c5 Extract save_cookies_from_locale comment-method 2020-07-03 14:03:52 +02:00
Matt-Yorkley
02549d1b0f Extract all locale-setting logic to a service 2020-07-03 13:44:13 +02:00
Matt-Yorkley
7a00a3ba1e Rename method and add explanatory comment 2020-07-03 11:52:21 +02:00
Matt-Yorkley
c726340ba3 Extract #save_locale_from_params comment-method 2020-07-03 11:48:39 +02:00
Matt-Yorkley
d2db9b3a66 Merge pull request #5599 from luisramos0/submit_on_enteer 
Make Enter submit the form on both products and orders admin
 2020-07-03 11:14:57 +02:00
Luis Ramos
91026e6606 Merge pull request #5601 from jeduardo824/enhancement/5454-links-to-shops-in-new-tabs 
Enhancement/5454 make links to shops under Groups > Producers open in new tab
 2020-07-02 23:51:59 +01:00
Luis Ramos
758bb17142 Fix some easy rubocop issues and add some exceptions to to manual todo list 2020-07-02 21:24:15 +01:00
Luis Ramos
659de3d24d Replay spree commit a4622ee13a723f0dba2943967b445b9989f67fb2 to fix issue introduced in spree 2.1 2020-07-02 21:24:15 +01:00
Luis Ramos
ff046f7a6c Remove conditionals related to Config.track_inventory_levels, this config is always true in OFN 2020-07-02 21:24:14 +01:00
Luis Ramos
ee66e37521 Move adjuster, estimator, packer and prioritizer to order management engine 2020-07-02 21:24:14 +01:00
Luis Ramos
83974a832c Move Coordinator from Spree::Stock to OrderManagement::Stock 2020-07-02 21:24:14 +01:00
Luis Ramos
01b1abbd52 Bring method from Spree::Order so that we can move Coordiantor to the order management engine 2020-07-02 21:24:14 +01:00