raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-02 02:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,045 Commits 17 Branches 455 Tags
8c9960854f03d485df730da663bfbbeb38ebe319
Commit Graph

18045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Pérez Fabregat
8c9960854f Merge pull request #6343 from Matt-Yorkley/api-controllers 
API controllers: strong paramaters
 2020-11-19 09:04:16 +01:00
Matt-Yorkley
b0a70f0ba3 Improve TaxonController strong params handling 2020-11-17 19:48:27 +00:00
Matt-Yorkley
0b18b0dc0a Include Calculator attributes in PaymentMethod nested attributes and DRY repeated code 2020-11-17 19:04:26 +00:00
Matt-Yorkley
d225294b6b Extract to PermittedAttributes::Calculator 2020-11-17 18:51:48 +00:00
Matt-Yorkley
3547b9fe56 Add missing calculator params 2020-11-17 18:51:48 +00:00
Matt-Yorkley
1766f33d46 Use ActionController::Metal and include StrongParameters 2020-11-17 18:51:48 +00:00
Matt-Yorkley
cbdb6126a6 Fix strong_params in API enterprises_controller 2020-11-17 18:51:48 +00:00
Matt-Yorkley
6a26c9da8c Fix strong_params in API products_controller 2020-11-17 18:51:48 +00:00
Matt-Yorkley
36f4f40e84 Refactor and fix PaymentMethod strong params 2020-11-17 18:51:48 +00:00
Matt-Yorkley
787f29105c Fix ForbiddenAttribute errors for bulk update of enterprise fees and order cycles 
Example error:
As an administrator
    I want to manage simple order cycles
 updating many order cycle opening/closing times at once
     Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s

     ActiveModel::ForbiddenAttributesError:
       {"order_cycle_set"=>{"collection_attributes"=>{"0"=>{"id"=>62, "name"=>"Updated Order Cycle 1", "orders_open_at"=>"2040-12-01 12:00:00", "orders_close_at"=>"2040-12-01 12:00:01"}, "1"=>{"id"=>63, "name"=>"Updated Order Cycle 2", "orders_open_at"=>"2040-12-01 12:00:02", "orders_close_at"=>"2040-12-01 12:00:03"}, "2"=>{"id"=>64, "name"=>"Updated Order Cycle 3", "orders_open_at"=>"2040-12-01 12:00:04", "orders_close_at"=>"2040-12-01 12:00:05"}}}, "controller"=>"admin/order_cycles", "action"=>"bulk_update", "format"=>"json", "order_cycle"=>{}}
     # ./app/controllers/application_controller.rb:20:in `print_params'
     # ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
     # ------------------
     # --- Caused by: ---
     # ActiveModel::ForbiddenAttributesError:
     #   ActiveModel::ForbiddenAttributesError
     #   ./app/models/model_set.rb:29:in `block in collection_attributes='
 2020-11-17 18:51:48 +00:00
Matt-Yorkley
642a294844 Fix broken order edit shipment 
As an administrator
    I want to create and edit orders
 as an enterprise manager viewing the edit page with different shipping methods can edit shipping method
     Failure/Error: expect(page).to have_content "Shipping: #{different_shipping_method_for_distributor1.name}"
       expected to find text "Shipping: Different" in "Logged in as : owen@romaguera.ca Account Logout Store DASHBOARD PRODUCTS ORDER CYCLES ORDERS REPORTS ENTERPRISES CUSTOMERS Order # R813516688 CANCEL ACTIONS BACK TO ORDER LIST John Doe - ADD PRODUCT NAME OR SKU (ENTER AT LEAST FIRST 4 CHARACTERS OF PRODUCT NAME) Select a variant 100 - PENDING ITEM DESCRIPTION PRICE QUANTITY TOTAL Product #3 - 9924 - 1g, S $10.00 1 x none $10.00 Product #4 - 5548 - 1g, S $10.00 1 x none $10.00 Product #5 - 8080 - 1g, S $10.00 1 x none $10.00 Product #6 - 3591 - 1g, S $10.00 1 x none $10.00 Product #7 - 6461 - 1g, S $10.00 1 x none $10.00 Product #8 - 4071 - 1g, S $110.00 1 x none $110.00 SHIPPING METHOD Different $0.00 Normal $0.00 Different $0.00 Tracking: U10000 LINE ITEM ADJUSTMENTS NAME AMOUNT Tax 1 10.0%: $10.00 ORDER ADJUSTMENTS NAME AMOUNT Transaction fee: $0.00 ORDER TOTAL $160.00 DISTRIBUTION Distributor: Enterprise 4 Order cycle: Order Cycle 2 UPDATE AND RECALCULATE FEES or BACK ORDER INFORMATION STATUS COMPLETE TOTAL : $160.00 SHIPMENT : PENDING PAYMENT : BALANCE DUE DATE COMPLETED : November 08, 2020 1:51 AM ORDER DETAILS CUSTOMER DETAILS ADJUSTMENTS PAYMENTS RETURN AUTHORIZATIONS"
     # ./spec/features/admin/order_spec.rb:291:in `block (5 levels) in <top (required)>'
 2020-11-17 18:51:48 +00:00
Matt-Yorkley
7401e34c52 Fix credit cards strong params 2020-11-17 18:51:48 +00:00
Matt-Yorkley
ca41bbcee7 Fix Api::VariantsController ForbiddenAttributesError 2020-11-17 18:51:48 +00:00
Matt-Yorkley
c374bf5e49 Fix strong_params in API taxons_controller 2020-11-17 18:51:48 +00:00
Matt-Yorkley
417c4d9aea Inherit from ActionController::Base in API Controllers 2020-11-17 18:51:48 +00:00
Maikel Linke
315a5f0fd9 Update translations v3.4.1-beta 2020-11-17 10:17:08 +11:00
Matt-Yorkley
c080c1f1d6 Merge pull request #6382 from Matt-Yorkley/menu-fix 
Fix the user menu
 2020-11-16 22:20:12 +01:00
Matt-Yorkley
3b92df42c3 Fix the menu! 
🙈
 2020-11-16 19:05:08 +00:00
Matt-Yorkley
e2dbb150e5 Update all locales with the latest Transifex translations 2020-11-16 16:02:40 +00:00
Luis Ramos
ca29604ff8 Merge pull request #6377 from luisramos0/repeat_calculator_migrations 
Repeat calculator migrations to clean up existing data
 2020-11-16 10:46:42 +00:00
Luis Ramos
e5b7c036d5 Repeat calculator migrations to clean up existing data 2020-11-13 16:35:22 +00:00
Pau Pérez Fabregat
6f1d8664ac Merge pull request #6355 from coopdevs/install-gems-on-docker-boot 
Install any missing gems when booting docker
 2020-11-13 13:32:27 +01:00
Pau Pérez Fabregat
8d5e90e40f Merge pull request #6365 from Matt-Yorkley/mail-settings 
Allow mail_auth_type to be set
 2020-11-13 13:30:17 +01:00
Pau Pérez Fabregat
6db80e837b Merge pull request #6361 from andrewpbrett/fix-gateway-error-error 
move gateway_error require to lib/spree/core.rb
 2020-11-13 13:15:13 +01:00
Matt-Yorkley
cec295a113 Merge pull request #6373 from andrewpbrett/fix-admin-users 
specify Spree routes for pagination, fix 500 on admin/users
 2020-11-13 11:30:16 +01:00
Maikel Linke
a553547403 Update translations 2020-11-13 14:15:45 +11:00
Maikel
1e4edc671a Merge pull request #6364 from openfoodfoundation/transifex 
Transifex
 2020-11-13 14:05:12 +11:00
Maikel
b2113c96a2 Merge pull request #6317 from openfoodfoundation/dependabot/bundler/kaminari-0.17.0 
Bump kaminari from 0.14.1 to 0.17.0
 2020-11-13 13:58:25 +11:00
Maikel
408103516e Merge pull request #6321 from openfoodfoundation/dependabot/bundler/awesome_nested_set-3.2.1 
Bump awesome_nested_set from 3.0.3 to 3.2.1
 2020-11-13 13:30:18 +11:00
Maikel
d96216b8d7 Merge pull request #6268 from yihyang/master-yy-added-product-sorting 
Sort products alphabetically in OC edit/create page
 2020-11-13 13:29:54 +11:00
Maikel
d4ff9055c0 Merge pull request #6351 from efgalvao/issue#6249 
Fixes Issue#6249
 2020-11-13 13:28:55 +11:00
Maikel
591ba34eb6 Merge pull request #6335 from cillian/reset-on-demand-on-inventory-import 
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
 2020-11-13 13:28:17 +11:00
Andy Brett
8dfd3f624d paginate zones using spree routes as well 2020-11-12 14:24:04 -08:00
Andy Brett
9cf30b431a specify Spree routes for pagination 2020-11-12 14:09:59 -08:00
Pau Pérez Fabregat
777cedd90d Merge pull request #6305 from efgalvao/issue#6292 
Fixed issue #6292.
 2020-11-12 17:42:42 +01:00
Transifex-Openfoodnetwork
b80d15b672 Updating translations for config/locales/pt_BR.yml 2020-11-13 02:43:56 +11:00
Transifex-Openfoodnetwork
228c7cc13a Updating translations for config/locales/pt_BR.yml 2020-11-13 02:40:55 +11:00
Pau Pérez Fabregat
7c4691ab33 Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker 
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
 2020-11-12 16:15:00 +01:00
Pau Pérez Fabregat
692adb0113 Merge pull request #6336 from coopdevs/fix-shop-layout 
Fix .top-bar-section not to wrap the icons-menu
 2020-11-11 17:29:53 +01:00
Matt-Yorkley
58e34b5ad6 Allow mail_auth_type to be set 2020-11-11 15:51:08 +00:00
Transifex-Openfoodnetwork
694bc6a598 Updating translations for config/locales/ar.yml 2020-11-12 02:18:05 +11:00
Transifex-Openfoodnetwork
e06b82f335 Updating translations for config/locales/ar.yml 2020-11-12 02:14:55 +11:00
Andy Brett
17202ff39c move gateway_error require to lib/spree/core.rb 2020-11-10 14:55:56 -08:00
Andy Brett
d5037abbe7 add specs for new/edit product pages 2020-11-10 10:49:14 -08:00
Pau Perez
5ddfc54b2b Install any missing gems when booting docker 
This runs `bundle install` if there are any missing gems when booting
the containers. `bundle check` ensures we don't unnecessarily run
`bundle install`, which is rather slow.

This avoids having to build the entire image (painfully slow) or having
to bring up a container just to install the gems. I used to do this
with `docker-compose run --rm web bundle install`.
 2020-11-10 18:08:34 +01:00
Pau Pérez Fabregat
bea8982085 Merge pull request #6329 from openfoodfoundation/transifex 
Transifex
 2020-11-10 17:37:00 +01:00
Pau Pérez Fabregat
fc06cc242b Merge pull request #6210 from ipalo/feature/update-docker-image-to-ubuntu-20-04 
Update the base Ubuntu Docker image from 18.04 to 20.04
 2020-11-10 17:30:03 +01:00
Pau Pérez Fabregat
b70c349b05 Merge pull request #6352 from openfoodfoundation/dependabot/bundler/webmock-3.9.5 
Bump webmock from 3.9.4 to 3.9.5
 2020-11-10 16:47:44 +01:00
Pau Perez
634ab5ca6a Don't scale logo image 
The trick using `width: 100%` and a set `max-width` doesn't work if we
can't know the image width as it can be uploaded by superadmins. There's
no need though because the media query breakpoint triggers just before that.
 2020-11-10 09:51:41 +01:00
Luis Ramos
c7c5a95407 Merge pull request #6345 from Matt-Yorkley/flaky-oc-spec 
Improve flaky order cycle spec
 2020-11-09 21:59:41 +00:00