raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,987 Commits 18 Branches 451 Tags
9abe41f6cb61ba1a16d1f7d014e6e66646df367f
Commit Graph

831 Commits

Author SHA1 Message Date
Luis Ramos
48985bbcd1 Use patch instead of put, because it's rails 4 
Extend the registration process spec to cover package selection
 2020-06-01 13:41:37 +01:00
Luis Ramos
f34f693620 Merge branch 'master' into 3-0-stable-may-22 2020-05-22 22:54:19 +01:00
Luis Ramos
9a71ffc093 Merge pull request #5438 from Matt-Yorkley/cart-stock-ux 
Cart stock UX
 2020-05-22 14:21:16 +01:00
Matt-Yorkley
f0525b861c Update expectations in API caching test 
Rails 4 has slightly changed the format of the cache keys here, so the response was not as expected.
 2020-05-22 14:54:57 +02:00
Matt-Yorkley
b00fbd69ae Update Fragment Caching for Rails 4 
Rails 4 introduced "automagically" modified cache keys, that included a digest in the key on any cache entry related to views. This is not what we want at all, fixed here with the `skip_digest: true` option.
 2020-05-22 14:22:21 +02:00
Matt-Yorkley
a9abe48ede Re-enable cache invalidation test 2020-05-22 14:21:45 +02:00
Matt-Yorkley
04ffe7b911 Fix expectations and mock responses for Rails 4 
Mocking these objects is working differently in Rails 4, and utilising `#and_call_original` helped to ensure different parts of the codebase were receiving the correct response objects (AR relations, etc).
 2020-05-22 14:21:45 +02:00
Luis Ramos
2ae34d8df3 Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page 
change shop name to be link to shop on transactions page
 2020-05-21 10:56:19 +01:00
Maikel
da55956a6e Merge pull request #5392 from luisramos0/ship_method_bo 
Make "backoffice only" ship methods work and remove option "frontoffice only"
 2020-05-21 10:16:15 +10:00
Matt-Yorkley
05e6f5792d Fix cart fields sharing same scope 
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
 2020-05-19 10:23:12 +02:00
Matt-Yorkley
e54fad9bfd Add spec for maximum quantities with multiple items in cart 
This currently fails
 2020-05-19 10:21:24 +02:00
Matt-Yorkley
fe27c8466e Add feature specs for full cart page stock correction process 2020-05-18 14:51:11 +02:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +01:00
Matt-Yorkley
14d928c39d Fix feature specs where UI has changed 2020-05-10 09:44:11 +02:00
Matt-Yorkley
3ca491683a Merge pull request #5317 from Matt-Yorkley/caching-timed-shops 
[Caching] Timed caching on shops data
 2020-05-09 15:33:26 +02:00
Pau Perez
fa8c1270ce Skip unreliable caching test 
This spec failed two times in a row and it's blocking the release.
 2020-05-08 16:37:30 +02:00
Luis Ramos
0a6bd1424c Make ship method display on back_end work correcly by making checkout ignore ship methods configured for backoffice only 
Adding both unit and feature tests as this is important enough for that
 2020-05-08 12:59:17 +01:00
Matt-Yorkley
5518ffa856 Ensure validations are called when updating attributes in test 2020-05-07 19:37:43 +02:00
Matt-Yorkley
86bfd1bebb Add explanatory comments on usages of Timecop.travel 2020-05-07 17:29:58 +02:00
Matt-Yorkley
01d741509f Fix test of rendered properties AMS 
Here the displayed properties that we're testing also rely on shops data (including the list of supplied properties), which is now cached for 15 seconds. We clear that cache entry so we can cleanly test only the caching of the properties AMS array.
 2020-05-07 15:20:37 +02:00
Matt-Yorkley
7457543c2b Adds spec for timed caching on shops data 2020-05-07 13:20:30 +02:00
Luis Ramos
3c7970f72f Add select oc message when there are multiple OCs 2020-05-07 12:18:40 +01:00
Luis Ramos
c64ba75e8d Merge pull request #5348 from luisramos0/single_oc_selector 
Replace select box with text when only one OC is available for selection
 2020-05-07 12:07:19 +01:00
Luis Ramos
d967d855fc Merge pull request #5319 from Matt-Yorkley/caching-by-class 
[Caching] Caching data by class
 2020-05-07 11:43:44 +01:00
Luis Ramos
1e9b4516cb Merge pull request #5318 from Matt-Yorkley/caching-api 
[Caching] API Action Caching on shop filters
 2020-05-07 11:42:52 +01:00
Luis Ramos
c7c8bfe212 Merge pull request #5347 from luisramos0/hide_oc_selector_for_private_shop 
[Mobile] Hide OC selector if shop requires login/customer
 2020-05-06 14:31:52 +01:00
Matt-Yorkley
4aac97c985 Add feature spec for action caching of taxon and properties endpoints 2020-05-06 11:47:51 +02:00
Luis Ramos
be4104d6f3 Merge branch 'master' into 3-0-stable-may-5 2020-05-05 19:11:20 +01:00
Matt-Yorkley
0a28abbf2d Add additional feature specs for soft-deleted variants in cart 2020-05-05 13:57:50 +02:00
Matt-Yorkley
068c8feea7 Merge pull request #5289 from Matt-Yorkley/cart-populate 
Cart populate
 2020-05-05 13:56:17 +02:00
Eduardo
2fca16f02f change shop name to be link to shop on transactions page 2020-05-04 07:06:07 -03:00
Luis Ramos
8e27ace563 Adapt specs where there is only one OC available to the absence of the OC selector 2020-05-02 20:16:41 +01:00
Luis Ramos
ef0e9dc0ca Replace select box with text when only one OC is available for selection 2020-05-02 19:01:33 +01:00
Luis Ramos
89cb447387 Hide OC selector if shop requires login/customer 2020-05-02 17:56:49 +01:00
Matt-Yorkley
1990417b72 Test values are not fetched from database when cache exists 2020-04-30 17:37:48 +02:00
Matt-Yorkley
7a22f7f783 Move and rename caching spec 2020-04-30 17:37:45 +02:00
Matt-Yorkley
f724d1b572 Add feature spec for caching properties and taxons AMS 2020-04-30 15:35:39 +02:00
Matt-Yorkley
53ebe10483 Fix issue with generic primary taxon in product factory changing which taxons are correctly counted as being in open order cycles. 2020-04-28 15:11:59 +02:00
Luis Ramos
839b373b5c Merge branch 'master' into 3-0-stable-Apr28 2020-04-28 13:40:19 +01:00
Luis Ramos
868929eed3 Merge pull request #4993 from luisramos0/move_ent_fees 
Change engine routes to better work with specs in rails 4
 2020-04-28 11:48:41 +01:00
Matt-Yorkley
3ce7e96777 Add some debounce and an onwheel hack to product add to basket field 
Debounce ensures we don't get a million requests if the up/down buttons are clicked rapidly. The onwheel hack adds some protection against scrolling triggering the quantity up/down. See: https://stackoverflow.com/a/51076231
 2020-04-27 19:27:07 +02:00
Luis Ramos
b5ba2acb21 Merge pull request #5169 from jeduardo824/enhancement/5102-make-shop-names-links 
make shop name a link on /account
 2020-04-09 22:01:34 +01:00
Matt-Yorkley
3aff7f62e3 Don't query distributed properties on enterprises that aren't active distributors 
Cuts page load on /shops by ~75% (with production data) and removes ~300 expensive and superfluous queries.
 2020-04-08 20:08:12 +02:00
Eduardo
e7b780f963 make shop name a link on /account 2020-04-06 08:34:24 -03:00
Luis Ramos
384ca310a3 Merge branch 'master' into 3-0-stable-apr3 2020-04-03 18:26:26 +01:00
Matt-Yorkley
62a00b17a2 Merge pull request #5026 from Matt-Yorkley/checkout_display 
Temporarily hide OC selector in checkout page
 2020-03-20 18:33:47 +01:00
Luis Ramos
1c628fac58 Merge branch 'master' into 3-0-stable-mar20 2020-03-20 11:28:06 +00:00
Matt-Yorkley
e8692fec4c Temporarily hide OC selector in checkout page 2020-03-20 12:08:58 +01:00
Luis Ramos
0b05312f19 Move cookies spec to web engine and adapt routes to the fact they are now normal main apps routes 2020-03-20 11:07:23 +00:00
Maikel Linke
ea80ae3832 Enable page navigation via URL fragment 
The broadcasting of notifications didn't update properly and I couldn't
find a way to listen to $location updates. I replaced the three
intertwined directives with one controller and a bit more HTML code. Now
we have only one scope that listens to $location and all browser actions
like the back button is reflected in the page.

As nice side-effect, the menu links have now the right destination so
that you can copy the link and paste it into another browser window.

40 lines less code.
 2020-03-19 15:37:13 +11:00