raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,954 Commits 20 Branches 451 Tags
5a5cbbd3181a71494de522c287a165950e9f98aa
Commit Graph

16954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
2dce10bec2 Fix admin enterprises controller spec, for some reason the correct controller is not being picked up in the test 2020-06-30 10:49:45 +01:00
Matt-Yorkley
11da385624 Enable pending checkout spec 2020-06-30 11:30:16 +02:00
Matt-Yorkley
3e7f5a4ea9 Update user address tests 
I considered deleting these tests, as they're not very good and are testing Rails functionality. I decided to leave them in case something explodes in a future upgrade. For reference: there are issues in Rails 4 when using `object.clone.attributes`, and with assigning a hash containing `created_at` and `updated_at` values with `object.update(attributes_hash)`.
 2020-06-30 11:30:16 +02:00
Matt-Yorkley
87cd936c94 Blacklist timestamp attributes when assigning for update 
Doing #clone or #dup of an object's attributes then passing it to an #update/#update_attributes call means we are manually passing values for created_at and updated_at, which can cause problems, especially if the object being duped hasn't been persisted yet: in this case we would be manually attempting to save timestamps with nil values, which is not a good idea. Here they are blacklisted from the attributes hash.
 2020-06-30 11:30:16 +02:00
Matt-Yorkley
ce8908f53b Use #dup when copying attributes hash 
In Rails 4, #clone behaves differently. The attributes hash of the cloned object is shared with the original, it's not a separate object! https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/core.rb#L217-L220
 2020-06-30 11:30:16 +02:00
Matt-Yorkley
abe96c6f32 Add specs for updating existing default addresses during checkout 
These specs fail with the "NULL values for created_at / updated_at" errors we've been seeing.
 2020-06-30 11:30:14 +02:00
Pau Pérez Fabregat
e69d3e5e0c Merge pull request #5693 from luisramos0/knapsack 
Reload knapsack report
 2020-06-30 09:43:36 +02:00
Pau Pérez Fabregat
2a1fe3f05f Merge pull request #5684 from openfoodfoundation/dependabot/bundler/ddtrace-0.37.0 
Bump ddtrace from 0.36.0 to 0.37.0
 2020-06-30 09:41:48 +02:00
Matt-Yorkley
57ba2481c4 Require timestamps 2020-06-30 09:09:35 +02:00
Pau Perez
0c93de8298 Manage OFN's font through the asset pipeline 2020-06-30 09:02:36 +02:00
Pau Perez
23178763b0 Do not print the bill addr. name when there's none 
The error

```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```

happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.

This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
 2020-06-30 08:46:01 +02:00
Luis Ramos
de8b97b2e1 Merge pull request #5526 from cillian/drop-blockenspiel 
Drop blockenspiel
 2020-06-29 20:09:26 +01:00
Matt-Yorkley
be0131b94c Merge pull request #5645 from coopdevs/fix-scss-deprecation-warning 
Rename *.css.scss to *.scss
 2020-06-29 20:36:42 +02:00
Matt-Yorkley
bd0e4c75c4 Merge pull request #5636 from fatihorhan/make-user-guide-links-consistent 
Update Sell page to use User Guide links from configuration
 2020-06-29 20:33:00 +02:00
Matt-Yorkley
b441ac2644 Update paths to "noimage" images 2020-06-29 20:07:08 +02:00
Matt-Yorkley
5bec887f93 Move /assets/images/noimage/* to /public/noimage/* 2020-06-29 19:58:38 +02:00
Cillian O'Ruanaidh
a9664e103d Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes. 2020-06-29 18:11:08 +01:00
Pau Perez
c892f9c69b Make button border radius consistent 2020-06-29 12:01:59 +02:00
Transifex-Openfoodnetwork
bb80c81097 Updating translations for config/locales/en_US.yml 2020-06-29 05:22:13 +10:00
Luis Ramos
6516037420 Reload knapsack report 2020-06-27 20:36:33 +01:00
Luis Ramos
10b8c2b789 Relax the assertion and dont check row number so that it passes even if order of elements is not the same 2020-06-27 15:54:58 +01:00
Matt-Yorkley
b325e48957 Update content config spec to use new default image paths 2020-06-27 10:32:38 +02:00
Matt-Yorkley
a5f541b59d Update admin logo path 2020-06-27 08:53:05 +02:00
Matt-Yorkley
ff8cb43717 Move default versions of Paperclip-managed images to /public 
Image paths for these files are handled by Paperclip, which (with our current version) does not handle fingerprints on assets. Therefore we need to make these images available under /public
 2020-06-27 08:45:59 +02:00
Cillian O'Ruanaidh
1199a356c4 Extract out a JS service for calculating where to centre the map when given a set of coordinates. 
Also removing the hardcoded default latitude/longitude from open_street_map directive because it's probably not very likely that it will be needed.
 2020-06-26 22:26:39 +01:00
dependabot-preview[bot]
032a70fa7e Bump ddtrace from 0.36.0 to 0.37.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.36.0 to 0.37.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.36.0...v0.37.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-26 19:16:32 +00:00
Transifex-Openfoodnetwork
4f2d32b262 Updating translations for config/locales/tr.yml 2020-06-27 04:22:14 +10:00
Cillian O'Ruanaidh
c40697cf61 If no enterprises have been geocoded yet make sure Open Street Map still displays correctly. 
Before it would display a gray/blank div instead of map because the map latitude, longitude couldn't be calculated without geocoded enterprises. This adds a setting so the default coordinates can be set even if no geocoded enterprises present.
 2020-06-26 15:45:58 +01:00
Luis Ramos
5e3d7be545 Merge pull request #5630 from openfoodfoundation/dependabot/bundler/ransack-1.8.10 
Bump ransack from 1.2.3 to 1.8.10
 2020-06-26 13:37:03 +01:00
Transifex-Openfoodnetwork
0d5ad6fac3 Updating translations for config/locales/en_IE.yml 2020-06-26 21:04:54 +10:00
Transifex-Openfoodnetwork
a1227d93ae Updating translations for config/locales/en_GB.yml 2020-06-26 20:27:34 +10:00
Transifex-Openfoodnetwork
f47271ba98 Updating translations for config/locales/fr.yml 2020-06-26 16:59:37 +10:00
Transifex-Openfoodnetwork
1266bcde1b Updating translations for config/locales/en_FR.yml 2020-06-26 16:56:19 +10:00
Maikel Linke
e567348a69 Ensure that enough time passes for caching spec 2020-06-26 14:24:01 +10:00
Maikel Linke
4b25c2d49a Correct typo in file naming 2020-06-26 14:21:21 +10:00
Maikel Linke
d7c9bb2e5a Navigate more efficiently in spec 
The spec is not supposed to test the navigation to the shop. Going
directly to the shop reduces the test execution time by 7%.
 2020-06-26 09:55:57 +10:00
Maikel Linke
70347148a1 Stabilise shopping specs and open them for change 
The way we add items to the cart will change. Encapsulating that code in
a common place will make the mobile ux work clearer and avoid merge
conflicts.

The waiting for background requests has also been improved and made more
consistent which should make these specs more reliable.
 2020-06-26 09:55:57 +10:00
Maikel Linke
a0c7dc2ccb Remove leftover empty spec context 2020-06-26 09:55:57 +10:00
Luis Ramos
5929b9c1e5 Merge pull request #5627 from openfoodfoundation/dependabot/bundler/geocoder-1.6.3 
[Security] Bump geocoder from 1.5.2 to 1.6.3
 2020-06-25 20:34:19 +01:00
Luis Ramos
2ad2836ac6 Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n 
add missing i18n key for closed OC
 2020-06-25 20:33:55 +01:00
Luis Ramos
93a2e57bc6 Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard 
Fix Payment Methods table to show proper provider name
 2020-06-25 20:32:04 +01:00
Luis Ramos
cb2ccf76d2 Merge pull request #5590 from rmklaus12/5558-shippingcategory-translation 
Added translation key to config/locales/en.yml file for shipping_cat…
 2020-06-25 20:31:48 +01:00
Luis Ramos
f44533bbd5 Merge pull request #5589 from rmklaus12/2617-mainmenu-translation 
Added more key to en.yml to translate More dropdown text
 2020-06-25 20:27:46 +01:00
Luis Ramos
bfc134c9e6 Merge pull request #5615 from openfoodfoundation/dependabot/bundler/acts-as-taggable-on-4.0.0 
Bump acts-as-taggable-on from 3.5.0 to 4.0.0
 2020-06-25 20:26:59 +01:00
Pau Pérez Fabregat
7338f196e9 Merge pull request #5663 from luisramos0/constraints 
Make db timestamps nullable
 2020-06-25 13:14:41 +02:00
Luis Ramos
68946a765e Make timestamps nullable 2020-06-25 08:47:18 +01:00
Transifex-Openfoodnetwork
0b48a53c2f Updating translations for config/locales/tr.yml 2020-06-25 16:02:01 +10:00
Transifex-Openfoodnetwork
54ce5d8c0f Updating translations for config/locales/en_CA.yml 2020-06-25 09:15:11 +10:00
Luis Ramos
ba50491c6d Restructure the spec a little 2020-06-24 16:16:58 +01:00
Luis Ramos
34207fc20f Bring changes to stock_item from spree 2.1, the previous version was from spree 2.0.4 2020-06-24 16:16:58 +01:00