raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,595 Commits 18 Branches 452 Tags
9fa46d378f4a1d7c88f9f4e2dcd7e7015bca3e33
Commit Graph

13767 Commits

Author SHA1 Message Date
jibees
ef31e1d063 Revert "Load product images in the shop lazily to improve performance" 2022-11-29 09:55:39 +01:00
Konrad
e288c7a551 Merge pull request #9956 from jibees/9626-resize-and-crop-logo-instead-of-just-resizing-should-fit-into-a-square 
Enterprise logo: Resize and crop logo instead of just resizing --> logo should fit into a square
 2022-11-27 20:28:55 +01:00
Konrad
dc030182db Merge pull request #10023 from abdellani/add-hub-filter-to-orders-and-distributors 
Add filter by distributor in "Orders And Distributors" report
 2022-11-27 19:52:19 +01:00
Konrad
ddd0b939fe Merge pull request #9968 from openfoodfoundation/9964-xero-reports-bugnsag-error-missing-target-element-checkbox-for-csv-select-controller 
Xero report: Avoid js error due to missing element, check it exists before setting any properties
 2022-11-27 19:20:16 +01:00
Rachel Arnould
56ce4ab04f Merge pull request #10025 from jibees/9998-new-admin-style 
Admin, behind feature toggle `admin_style_v2`: new navigation menu
 2022-11-24 14:59:04 +01:00
vviekk
22559a755f Removing 'required' tag for 'Latitude / Longitude' for Enterprises 
Empty/Null values are valid in db and for existing use-cases
 2022-11-21 15:19:28 +05:30
Jean-Baptiste Bellet
09bcc772ff Remove useless line 
Co-Authored-By: David Cook <david@redcliffs.net>
 2022-11-21 09:49:06 +01:00
Jean-Baptiste Bellet
49e376f9b6 New design of the admin navigation menu! 2022-11-21 09:48:35 +01:00
Jean-Baptiste Bellet
85d3f5f9d7 Download OpenSans font also at 700 weight 
needed in the navigation
 2022-11-21 09:48:35 +01:00
Jean-Baptiste Bellet
9dd81604e9 Put navigation menu into span even if no icon next to it 2022-11-21 09:48:35 +01:00
Jean-Baptiste Bellet
61d3f79444 Add admin-v2 scss style file 2022-11-21 09:48:35 +01:00
Jean-Baptiste Bellet
60f0a58508 Add admin-v2 on admin body if admin_style_v2 feature toggled on 2022-11-18 09:46:05 +01:00
Mohamed ABDELLANI
4b1bd362e0 [skip ci] add hub filter to the Order and Distributors report 2022-11-18 07:29:08 +01:00
Konrad
8510379178 Merge pull request #9985 from binarygit/add-spinner-when-enterprise-sells-changes 
[Admin][Enterprise Settings] Show spinner when enterprise sells option changes
 2022-11-17 16:59:55 +01:00
Sigmund Petersen
52487a270d Merge pull request #9889 from mkllnk/dfc-products 
Activate DfcProvider with feature toggle, not prod
 2022-11-16 12:26:44 +01:00
jibees
6dcc50ad15 Revert "Cache address JSON to avoid database queries" 2022-11-15 10:40:22 +01:00
binarygit
8fc721c651 [Admin, Enterprise Settings] Show spinner when enterprise sells changes 2022-11-13 16:24:35 +05:45
Konrad
59d555165f Merge pull request #9936 from dacook/minor-admin-updates 
Code cleanup: admin interface
 2022-11-12 19:43:44 +01:00
Konrad
c6178f5df9 Merge pull request #9877 from mkllnk/ignored-columns 
Remove outdated ignoring of Paperclip columns
 2022-11-11 21:08:42 +01:00
Konrad
c44195c8a0 Merge pull request #9911 from viniciusueharaweb/9781-improve-shipping-category-not-found-error-message 
[Product Import] Wrong error message when shipping category does not match predefined shipping categories
 2022-11-10 22:48:25 +01:00
Filipe
4b3184a6ef Merge pull request #9923 from mkllnk/cache-country 
Cache default country for an hour
 2022-11-10 19:10:29 +00:00
Filipe
f1dd69a4f7 Merge pull request #9926 from mkllnk/cache-address 
Cache address JSON to avoid database queries
 2022-11-10 18:18:03 +00:00
Filipe
24eda1bfae Merge pull request #9927 from mkllnk/lazy-load-product-images 
Load product images in the shop lazily to improve performance
 2022-11-10 18:11:56 +00:00
Konrad
ae09f7a415 Merge pull request #9869 from abdellani/fix-unit_value_with_description-calculation-on-products-page_admin_dashboard 
use js-big-decimal to calculate unit_value_with_description in products page
 2022-11-10 18:47:16 +01:00
Filipe
a7353eb69f Merge pull request #9575 from apricot12/9487-Dimensions-Packing-Reports 
Added HEIGHT, WEIGHT, WIDTH, DEPTH columns to packing reports by customer.
 2022-11-10 09:55:26 +00:00
Jean-Baptiste Bellet
4f265eed2a Check that target exists before setting properties 
In case of Xero reports, there are no checkbox
 2022-11-10 09:55:36 +01:00
Jean-Baptiste Bellet
bdf132a833 Format file according to our prettier configuration 2022-11-10 09:49:28 +01:00
Jean-Baptiste Bellet
262b546836 Add some visual spacing 2022-11-08 14:59:23 +01:00
Jean-Baptiste Bellet
4bfd39caec The info tip indicates image should be 100*100, so display it at 100*100 size 2022-11-08 14:54:47 +01:00
Jean-Baptiste Bellet
58c8eae08c Enterprise logo: resize and crop at the center of image instead of just resize 
Should fit in a square format
 2022-11-08 14:54:11 +01:00
Mohamed ABDELLANI
70e47f3929 fix: convert @attrs[:units] to big decimal instead of float in the unit converter 2022-11-08 10:26:00 +01:00
Mohamed ABDELLANI
44d719fcb5 use js-big-decimal to calculate unit_value_with_description 2022-11-08 10:26:00 +01:00
Jean-Baptiste Bellet
39e5613db8 When confirm modal is dismissed, reset daterange picker to previous values 
+ update specs as well
 2022-11-04 14:18:29 +01:00
David Cook
20c0449128 Remove unnecessary case 
Seems cleaner to me.

Best viewed with whitespace ignored.
 2022-11-04 14:26:41 +11:00
David Cook
5405d6f525 Ensure all text inputs have full width 
I think `url` and `tel` are currently unused, but I think we should use them in the future.
 2022-11-04 14:26:39 +11:00
Jean-Baptiste Bellet
228e484f02 Flatpicker instance can now handle flatpickr:change event 
With:
```
detail: {
  startDate: "2022-10-02",
  endDate: "2022-10-10"
}
```
 2022-11-03 16:57:03 +01:00
Jean-Baptiste Bellet
1a241e4953 Only call confirmRefresh() on time, on date range change 
Previously, when changing the date range, we had several modals that opened.
Now, the `confirmRefresh()` method should be open only one time.

Update specs as well:
 - use the method `accept_confirm`
 - Removing pending and sleep as the spec is now green
 2022-11-03 15:55:48 +01:00
Maikel Linke
762beb7c1c Load product images in the shop lazily 
The browser decides when to load the image, usually when it's close to
the viewport.
 2022-11-03 14:02:01 +11:00
Maikel Linke
118c1f7cbd Cache address JSON to avoid database queries 
We found that our database is quite busy querying the country all the
time. One source of these queries is the shop front which serializes
enterprises including their addresses. But addresses should be safe to
cache because:

- country records never change
- state records never change
- updating any other attribute changes the cache key

The caching was previously removed when the state_name attribute was
added. That is technically correct because it's possible to change a
state's name without updating the address. Then the cache would be out
of date. But we never update state names. And if we did, we would need
to invalidate the cache now.
 2022-11-03 13:07:59 +11:00
Maikel Linke
a2c4242994 Simplify Address code 
The DefaultCountry code has a fallback already.
 2022-11-02 16:21:15 +11:00
Maikel Linke
392aeb7321 Remove unused method loading default country 
And another unused method.
 2022-11-02 16:21:15 +11:00
Maikel Linke
f971131888 Cache default country for an hour 
The default country usually never changes after the initial setup of an
instance.
 2022-11-02 15:33:43 +11:00
Vinicius Uehara
f6cc9fca26 Prioritize attribute errors over product validations 
With product validations being prioritized, custom and
insightful error messages were being overwriten by
general and ambiguous model validations, which
were confusing users
 2022-10-30 20:02:08 -03:00
Vinicius Uehara
1f498e6052 Improve shipping category not found error message 2022-10-30 20:02:05 -03:00
Konrad
68b2e48fb3 Merge pull request #9900 from ijdershem/idersh/issue-9845 
[9845] Make checkout terms and conditions label clickable
 2022-10-28 14:28:06 +02:00
Konrad
0202bb40cf Merge pull request #9827 from saunmanoj888/fix-vairant-unit-decimal-issue 
Fix unit description UI issue on updating a Product having imperial weight (oz)
 2022-10-28 13:52:00 +02:00
Filipe
f7c62dfe45 Merge pull request #9862 from drummer83/master 
Format reports as list, even if only one sub-type available
 2022-10-28 12:13:42 +01:00
ijdershem-jf
0f9f4b07a8 [9845] Make checkout terms and conditions label clickable; associate label with input using correct for attribute 2022-10-27 20:30:42 -06:00
Konrad
d544233bac Merge pull request #9780 from jibees/9777-select-the-right-country 
Admin, Enterprise Details: Fix country selection on business address panel
 2022-10-27 14:32:52 +02:00
Maikel Linke
36c44a5487 Allow FeatureToggleConstraint to run w/o warden 
Routing specs and controller specs don't set warden on the request
environment. While we could try to re-implement Warden/Devise logic
here, it's much easier to not rely on the environment to be set.

While I'm usually opposed to changing production code to make testing
easier, it does avoid a lot of complication in this case. And maybe it
would be handy in other circumstances to have a more defensive approach
to checking the logged in user.
 2022-10-27 15:07:04 +11:00