raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 21 Branches 450 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

1009 Commits

Author SHA1 Message Date
Matt-Yorkley
2595cb85f7 Merge pull request #8001 from Matt-Yorkley/terms-and-conditionals 
Fix platform terms of service checkbox
 2021-08-05 14:17:48 +02:00
Matt-Yorkley
b7a75188d8 Simplify checkbox selectors used in checkout specs 2021-07-30 17:29:21 +01:00
Matt-Yorkley
bd041a2e09 Use puma in the test suite and remove server errors hack 2021-07-28 12:43:05 +01:00
Andy Brett
ac0c1f3c70 Merge pull request #7823 from apricot12/Migrate_Kaminari_to_Pagy_for_pagination 
Migrate kaminari to pagy for pagination
 2021-07-14 10:11:11 -07:00
Andy Brett
a58e0fe217 Merge pull request #7926 from luisramos0/rubocop_fix 
Update Rubocop todo files
 2021-07-14 10:05:54 -07:00
Matt-Yorkley
447165f8a1 Update #expect calls to count products correctly 2021-07-14 13:19:02 +01:00
Nihal Mohammed
1ac2e1a8a6 Try reverting shopping_spec 2021-07-14 13:19:02 +01:00
Nihal Mohammed
2acc339341 Update shoppign spec 2021-07-14 13:19:02 +01:00
Nihal Mohammed
894a11c9c1 Update shopping spec to fix CI error 2021-07-14 13:18:01 +01:00
Luis Ramos
1fb162bb4c Result of running rubocop -a, safe auto correct 2021-07-13 23:06:56 +01:00
Jean-Baptiste Bellet
1a8a12fb0c Filter language to not display the current lang in the dropdown 
No need to set a lang that is actually already set
 2021-07-08 09:15:09 +02:00
Jean-Baptiste Bellet
aa982fe8df Create a new method to change the lang of the app 
- The old method (link to `?locale=#{l.to_s}`) was not functional for path that already has query params in current path (such as `/user/spree_user/password/edit?reset_password_token=`) ;
 - This seems that the best way to handle this, is to create a new route, new method that effectively set the lang (not the locale actually...) and then redirect_back (ie. using the HTTP_REFERER, with a fallback to `/`)

s
 2021-07-06 10:09:37 +02:00
Pau Pérez Fabregat
db993652c4 Merge branch 'master' into payment-states 2021-06-18 12:20:26 +02:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files 
This is an unsafe auto corection, we will need to trust our build here
 2021-06-17 23:07:26 +01:00
Andy Brett
2699e17b63 update specs to create payment in requires_authorization state 2021-06-17 14:23:59 -07:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00
Pau Pérez Fabregat
a8efbffca6 Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate 
[Adjustments] TaxRate changes
 2021-06-17 11:51:01 +02:00
Matt-Yorkley
690cbe3ad3 Merge pull request #7468 from mkllnk/6328-tos-tracking 
6328 tos tracking
 2021-06-10 19:48:13 +02:00
Maikel
6caae9e886 Merge pull request #7694 from coopdevs/split-confirm-order-job 
Split ConfirmOrderJob to avoid blocking DJ worker
 2021-06-09 14:11:10 +10:00
Maikel Linke
af314cbbdf Allow fast checkout without re-accepting old terms 
We did that for the shop's terms already and now do it for the platform
terms as well.
 2021-06-09 14:06:54 +10:00
Maikel Linke
23999c96bf Unify all links to platform Terms of service 
DRY code and have more consistency. We always use "Terms of service" now
and not "Terms of Service" or "Terms and conditions". The latter is used
for the shop's terms, not the platform terms.
 2021-06-09 14:06:54 +10:00
Jean-Baptiste Bellet
e3f56556cf Remove feature toggle around unit_price and enable it 2021-06-07 20:53:45 +02:00
Matt-Yorkley
19f32b7825 Update checkout tax display test setup 2021-06-06 20:16:03 +01:00
Matt-Yorkley
efcf71fd2b Use OrderContents in cart spec test setups 2021-06-04 17:26:49 +01:00
Andy Brett
b3e08b47b9 set Stripe api key directly instead of using allow 2021-06-01 22:33:12 +01:00
Pau Perez
74a8b3038a Split ConfirmOrderJob to avoid blocking a worker 
This unties this two email notifications so that they are picked up by
a DJ worker independently. This should avoid the blocking the worker experiences (remember we
still have a single one in all instances) when waiting between the two
deliveries. See the flamegraph:
https://app.datadoghq.com/apm/traces?end=1622015605459&paused=true&query=env%3Aproduction%20service%3Adelayed_job%20operation_name%3Adelayed_job%20resource_name%3AConfirmOrderJob%20%40duration%3A%3E%3D5s&start=1622009898303&streamTraces=true&trace=AQAAAXmngbg_woqc_QAAAABBWG1uZ2IwVkFBRHVDbWJkN25QTUVuY28&traceID=2916038355421570548&spanID=2005781139590273685.

Overall, both operations may take longer but other jobs can be processed
in between. Also, if any of the two fails, the other won't be affected.
 2021-06-01 11:43:00 +02:00
Jean-Baptiste Bellet
0c8bfea2f7 Add feature tests for upload images on enterprise registration 
For both logo and promo images
 2021-05-25 15:30:35 +02:00
Luis Ramos
fb560089b9 Replace usages of update_attributes! with usage of update! 2021-05-19 09:54:25 -07:00
Luis Ramos
b2e97fe1d2 Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment! 2021-05-19 09:54:22 -07:00
Pau Pérez Fabregat
057bcddee9 Merge pull request #7478 from jibees/7458-get-products-on-order-cycle-change-events 
Get the whole list of products on order cycle changes
 2021-04-30 11:39:15 +02:00
Andy Brett
8ba139c6fb Merge pull request #6825 from julesemmac/6584-map-location-confirm 
6584 map location confirm
 2021-04-29 14:04:06 -07:00
Jean-Baptiste Bellet
5a3771fc42 Add special config to avoid a inconsistant LoadError 
Error is
```
Failure/Error: @app.call(env)
     LoadError:
       Unable to autoload constant Api::V0::OrderCyclesController, expected /Users/jibees/dev/openfoodnetwork/app/controllers/api/v0/order_cycles_controller.rb to define it
```
 2021-04-29 15:31:24 +02:00
Matt-Yorkley
5934b100e9 Test payment and shipment states in checkout spec 
If these aren't behaving correctly we need to know about it...
 2021-04-27 14:27:35 +01:00
Jean-Baptiste Bellet
5085501f89 Add automated tests around pagination in product list for a shop 
- with two order cycles and go from one to the other
 2021-04-27 11:24:56 +02:00
Cillian O'Ruanaidh
c41476423b Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb 2021-04-22 19:43:49 +01:00
Matt-Yorkley
3bce1bad62 Add missing Stripe API request stub 
The first time the checkout is submitted here it uses the defaults in CheckoutRequestHelper#fill_out_details
 2021-04-13 15:41:37 -07:00
Matt-Yorkley
ead85e71de Update shipping tax in checkout spec 2021-04-04 19:19:06 +01:00
Andy Brett
5a19a14042 rename to v0 2021-03-27 11:21:18 -07:00
Matt-Yorkley
0f5af2d9f1 Merge pull request #6927 from Matt-Yorkley/adjustments-payment-fee 
[Adjustments] Payment fee adjustment
 2021-03-25 17:40:53 +01:00
Matt-Yorkley
0ab43d23f9 Replace deprecated reloading by passing true to an association 
object.relation(true) -> object.relation.reload
 2021-03-24 17:51:22 +00:00
Matt-Yorkley
8abfd7c3f3 Update Checkout spec 2021-03-23 18:17:50 +00:00
Andy Brett
f784db0127 Merge pull request #7100 from luisramos0/view_spec_in_rails5 
Rails 5-2 - View spec in rails5
 2021-03-22 16:42:56 -07:00
Cillian O'Ruanaidh
f20cea7e4f Allow people to set enterprise latitude/longitude manually or automatically. 
This for new changes to the enterprise registration/signup flow where a map will be displayed when people are filling in their address. On this map people can check the geocoder has geocoded their address correctly and if not they can manually adjust their latitude/longitude on the map.

But currently every time someone changes their address in the Admin > Enterprise > Address section the address would automatically be geocoded so this could overwrite the latitude/longitude that was set during sign up. To prevent the latitude/longitude from being overwritten this add's a checkbox which people need to explicity click if they want their address to be automatically geocoded, otherwise it will just use the manually configured latitude/longitude.

Note this new feature which allows people to select their location on a map during registration only works with Google maps so far. So if an instance is using Open Street Map this change also adds support for passing a :use_geocoder parameter to the Api::EnterprisesController during registration so that the address will be geocoded on the backend without the use of a map.
 2021-03-19 21:43:29 +00:00
Maikel
c4370f1583 Merge pull request #7045 from jibees/7008-add-automated-tests-for-unit-price 
add automated tests for unit price in the shopfront
 2021-03-19 11:01:25 +11:00
Matt-Yorkley
479c1ae6e6 Merge pull request #7062 from mkllnk/6327-terms-of-service 
Show Terms of Service at checkout if required
 2021-03-18 19:16:06 +01:00
Jean-Baptiste Bellet
014ffef16c Add tests about unit price inside the cart sidebar 
- Test if the question mark icon is present
 - Click to show the tooltip
 - Another click to hide the tooltip
 2021-03-18 09:40:04 +01:00
Jean-Baptiste Bellet
1be1d161d3 Add tests about unit price inside a shopfront 
- Test that the unit price wrapper is here
 - Click on the question mark icon and display the tooltip
 - Click outside the question mark icon and hide the toolip
 2021-03-18 09:40:04 +01:00
Pau Perez
cf730f8b0c Temporarily skip embedded shopfront flaky spec 
Closes #7129 as discussed on that issue.
 2021-03-17 16:06:48 +01:00
Luis Ramos
c5581fa25f Rename spec/support/CheckoutHelper to resolve colision with app/helpers/CheckoutHelper 2021-03-16 23:20:11 +00:00
Matt-Yorkley
6bb85e9acd Fix payment and shipment states issue 
For some reason the order objects were stale here when calling order.update! from either a payment or shipment callback, which was overwriting those states as nil on the order.
 2021-03-11 12:23:00 +00:00