raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-28 06:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,676 Commits 17 Branches 460 Tags
aa9fd682d8f0bf1c8e5cff5ae2fec08504cac2f1
Commit Graph

2265 Commits

Author SHA1 Message Date
Matt-Yorkley
aa9fd682d8 Remove is_master and not_master scopes 
(cherry picked from commit 1daab8994d)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
dda3cfa58d Remove master variant validation conditionals 
(cherry picked from commit 85059bfb26)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
89b59f97ee Reorganise associations, validations, scopes and callbacks for clarity 
(cherry picked from commit 1922598d2d)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
26d3cffba3 Remove master variant from product 
(cherry picked from commit 3ef7d2c9ff)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
8e99f496ff Migrate product image from master variant to product 
(cherry picked from commit 7dc1091bc2)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
2f2506e698 Migrate master variant :sku to product 
(cherry picked from commit d8649fc9fb)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
7ef9c2f56a Stop storing unit_value and unit_description on master variant 
(cherry picked from commit 6b9b5ea347)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
ee4402f751 Stop using master variant for storing :display_as value 
(cherry picked from commit 8c0b8dad85)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
79a2d1228d Stop using master variant as a potential store for prices 
(cherry picked from commit 1b06c20197)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
75ccc5c72f Simplify product images delegation mess 
(cherry picked from commit d4188da7c1)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
aca72e6071 Remove dead code 
(cherry picked from commit 42a5a48816)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
7068df5d4b Merge pull request #10804 from Matt-Yorkley/public-images 
Update ActiveStorage image processing
 2023-06-15 15:49:11 +01:00
Matt-Yorkley
5ad37ce6a5 Return default image url on ActiveStorage errors in image loading 2023-06-14 12:53:20 +01:00
Matt-Yorkley
b510668ecf Render direct URLs for s3 images 2023-06-14 10:56:10 +01:00
Matt-Yorkley
551d0d3a93 Simplify calling #url_for in models 2023-06-14 10:56:10 +01:00
Matt-Yorkley
a898915724 Use named image variants 2023-06-14 10:56:10 +01:00
Matt-Yorkley
e54cff2274 Set images to public-read 
Defining an alternate s3 configuration set to `public: true` means we can use it selectively. It sets the objects to `acl: "public-read"` by default (read-only) and means any image tags for those assets can use direct public links in the src attribute (without hitting the ActiveStorage::Representation endpoint). The default non-public service will still be used by default for any other files on instances using s3.
 2023-06-14 10:56:10 +01:00
Maikel Linke
d88781a083 Start to adopt new default to require belongs_to 
Newer version of Rails have this option as default. We can slowly
transition to opt in gradually, model by model. Once all models are
covered, we can change the default and remove the setting from the
models again.

The style violation was added to the todo file because it's temporary.

We have 60 models using `belongs_to`. And changing them all at once
breaks some specs. So let's do it gradually.
 2023-06-14 15:06:59 +10:00
Matt-Yorkley
4e7fab6914 Delete dead code Checkout#find_transition 
This method is only called from tests and nowhere else in the codebase. We may as well remove it.
 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
907c65d98c run create_tax_charge! after transition to payment state 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
c2aaf88e98 remove checkout controller 2023-06-13 14:58:16 +01:00
Gaetan Craig-Riou
41b3ddae08 Merge pull request #10714 from macanudo527/fix_linelength 
Fix Style/LineLength
 2023-06-12 09:53:23 +10:00
Matt-Yorkley
24200de8dd Require localized_number in Payment class 
There seems to be some contexts (jobs for subscriptions) where the Payment class loads but LocalizedNumber is an undefined constant. It lives in the /lib directory so it's not auto-loaded.
 2023-06-09 18:16:37 +01:00
Neal Chambers
9a8551e3ea Shorten Where Statement 2023-06-09 16:39:29 +09:00
Matt-Yorkley
f4261b85b8 Merge pull request #10940 from Matt-Yorkley/order-tidyup 
Order class tidyup
 2023-06-08 15:06:59 +01:00
Matt-Yorkley
bf051fc35b Pull checkout-workflow-related callback methods out into the Checkout module which defines checkout state changes 2023-06-07 18:54:20 +01:00
Matt-Yorkley
760bf269ca Pull validations-related methods out into a separate module 2023-06-07 18:54:20 +01:00
Matt-Yorkley
e88843c733 Ensure order number is generated nicely on new records 2023-06-07 00:58:43 +01:00
Matt-Yorkley
67c3e09dba Use RESTful routes for orders controller actions 2023-06-07 00:35:47 +01:00
Matt-Yorkley
7c72969792 Move Order #state_changed method out into Checkout concern (alongside order states logic) 2023-06-05 23:54:04 +01:00
Matt-Yorkley
a62e51c0d0 Remove Order #refresh_shipment_rates method 2023-06-05 23:54:04 +01:00
Matt-Yorkley
1a7d70772a Make Order #products_available_from_new_distribution method private 2023-06-05 23:54:04 +01:00
Matt-Yorkley
3dd4e7ef03 Delegate order updater method 2023-06-05 23:54:04 +01:00
Matt-Yorkley
8a27dd84fe Make Order #disallow_guest_order method private 2023-06-05 21:30:49 +01:00
Matt-Yorkley
05a715a43a Remove Order #distribution_set? method 2023-06-05 21:30:46 +01:00
Matt-Yorkley
17b10d10c0 Make Order #deliver_order_confirmation_email method private 2023-06-05 21:30:43 +01:00
Matt-Yorkley
10dbeb32b2 Remove Order #credit_cards method 2023-06-05 21:30:40 +01:00
Matt-Yorkley
b3bd112cdb Remove Order #shipped_shipments method 2023-06-05 21:30:36 +01:00
Matt-Yorkley
0ac10472cf Update app/models/spree/line_item.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-01 10:12:19 +01:00
Matt-Yorkley
a20277c3a7 Completely remove option_values and option_types from the codebase 2023-06-01 10:12:19 +01:00
Matt-Yorkley
35b41fc7fe Persist unit_value on variant and "option value text" on variant and line_item and improve related AR callbacks 2023-06-01 10:12:19 +01:00
Matt-Yorkley
bfcf1203ac Delete dead code 2023-06-01 10:11:20 +01:00
Matt-Yorkley
3e5ecba738 Remove unhelpful Helper 2023-06-01 10:11:20 +01:00
Maikel Linke
ef3422bf58 Update syntax and clarify use of outdated gem 2023-05-23 08:23:58 +02:00
Maikel Linke
90cbac7176 Validate email domains 
The gem checks the DNS system for a valid domain entry.
 2023-05-23 08:23:58 +02:00
Maikel Linke
ffc45f77cf Validate user email syntax on change 
We probably have invalid entries in the database and we don't want these
records to suddenly become invalid. People would not be able to log in.
 2023-05-23 08:23:58 +02:00
saunmanoj888
aee7645e29 Fix searching issue with full name on bulk order management 2023-05-17 13:14:10 +02:00
Gaetan Craig-Riou
d29119f5c5 Remove non need belongs_to associations from Adjustments 
It turns out the "tax_rate" association isn't used and wasn't working.
Same for the "voucher" one, which I added to be consistent with existing
code.
Both of these weren't caught by the specs because you can't test associations
with a custome relation with 'shouda-matchers' see: https://github.com/thoughtbot/shoulda-matchers/issues/981
 2023-05-15 13:42:40 +10:00
Matt-Yorkley
9b1725d39f Fix model name in adjustment association 2023-05-15 13:42:40 +10:00
Gaetan Craig-Riou
43ab881181 Rename order association to voucher_adjustments 
The name vouchers is a bit confusing as the order is linked to a
voucher adjutment and not the actual voucher
 2023-05-15 13:42:39 +10:00