raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-17 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,671 Commits 15 Branches 453 Tags
b6e4ff908f9cd07bb4b66ed8eee080f742a6f349
Commit Graph

14199 Commits

Author SHA1 Message Date
Maikel Linke
6f83607aa8 Remove unused product meta description from DB 2023-03-29 14:35:16 +11:00
Maikel Linke
70aff98581 Remove unused product meta description from UI 2023-03-29 14:33:42 +11:00
Konrad
c887efee54 Merge pull request #10519 from vviekk/viv/10515 
Removing 'none' from shipping categories from product edit page
 2023-03-27 14:01:11 +02:00
vviekk
9a10c8c25a Removing none from shipping categories from product edit page 2023-03-27 11:56:10 +05:30
Konrad
4c61666fc7 Merge pull request #10547 from vviekk/10419 
Enable invoices config only controls Print bulk action
 2023-03-26 13:53:20 +02:00
Konrad
0c6a12a6f0 Merge pull request #10241 from binarygit/provide-err-msg-when-using-text-in-var-field 
Admin, edit variant: only allow numerical values for weight, height, width and depth fields
 2023-03-26 13:03:20 +02:00
Filipe
31ffeab4cd Merge pull request #10440 from mkllnk/rails7 
Upgrade to Rails 7.0
 2023-03-23 12:04:11 +00:00
Filipe
1673a18eb6 Merge pull request #9729 from binarygit/remove-angular-from-users 
Admin, Enterprise Settings, Users tabs: remove tooltips directives + use reflex to invite user to be managers
 2023-03-23 11:52:18 +00:00
Jean-Baptiste Bellet
29cdadd563 Avoid using exception but simply errors attribute contained in object 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-03-23 11:21:15 +01:00
binarygit
ecd5033efa Replace angular for when adding a new unregistered manager to an enterprise 
Co-Authored-By: David Cook <david@redcliffs.net>
 2023-03-23 11:21:05 +01:00
Jean-Baptiste Bellet
a13227defa Add I18N to all reflexes 2023-03-23 11:21:05 +01:00
Jean-Baptiste Bellet
465a295dfa Delete manager invitation controller 2023-03-23 11:21:05 +01:00
Jean-Baptiste Bellet
9c84a6936a Create a concern for manager invitations 
Can be used elsewhere

Update manager_invitations.rb
 2023-03-23 11:21:05 +01:00
Filipe
6b30a654a6 Merge pull request #10516 from macanudo527/fix_taxonomy 
Fix Sorting entries in a taxonomy is broken
 2023-03-23 09:23:16 +00:00
Filipe
12de3ae584 Merge pull request #10509 from mkllnk/filter-shipping-methods-by-category 
Filter shipping methods by category
 2023-03-21 17:47:22 +00:00
Rachel Arnould
75c3bf8b56 Merge pull request #9630 from binarygit/remove-angular-from-business-details 
Remove angular from business details
 2023-03-21 18:31:40 +01:00
Maikel Linke
31db35675b Add feature toggle for filtering shipping methods 2023-03-21 14:49:47 +11:00
Maikel Linke
6b25c36476 Filter ship methods by required shipping category 
The products in an order may require several shipping categories like
refrigeration or express. We now filter the categories according to
their support of shipping categories.
 2023-03-21 14:30:45 +11:00
Maikel Linke
73fa6295ec Simplify shipping method selection code 2023-03-21 14:30:44 +11:00
Maikel Linke
b5f43b3c1c Rename method because it's not changing the input 
A common Ruby convention is to to use the bang naming `!` to mark method
which change the given parameter instead of returning a copy.
 2023-03-21 14:30:44 +11:00
Maikel Linke
fcc68a0a19 Return new filtered list instead of modifying 
This makes a clear distinction between the unfiltered and filtered list.
There may also be some gotchas when modifying the array of an
ActiveRecord relation. It also allows us to write shorter code without
storing a separate variable.
 2023-03-21 14:30:44 +11:00
Maikel Linke
6f3a0e8812 De-duplicate early for better performance 2023-03-21 14:30:44 +11:00
Maikel Linke
d7e4962fba Add method for easier reading 2023-03-21 14:30:44 +11:00
Jean-Baptiste Bellet
918e220557 Move $locationProvider configuration to another file 
Actually the `config()` method of `admin_ofn` file did not run on `/admin/enterprises/*` pages for an unknown reason

Now those two files have the same configuration
 2023-03-20 08:37:47 +01:00
binarygit
a397ba1ca9 Replace what's this tooltips 
There are tooltips here that don't have a what's this?
There are many angular directives/methods being used that I haven't
looked into
Every select box is using select2
 2023-03-20 08:37:47 +01:00
Maikel
512cb44df5 Merge pull request #10330 from mickenorlen/8909-add-balance-to-api-v1-customer-endpoint 
Add balance to api v1 customers endpoint
 2023-03-20 15:47:41 +11:00
Mohamed ABDELLANI
008b12a75d remove "/" from the partial path to load sub-report filters 2023-03-20 10:41:28 +11:00
Konrad
2e426c701e Merge pull request #10232 from binarygit/show-correct-error-when-user-inputs-url-as-ig-acc 
[Enterprise->Create] Show correct error message when user inputs url in instagram field
 2023-03-19 21:57:02 +01:00
Filipe
8bef0f9a43 Merge pull request #10337 from jibees/9419-send-invoices-per-email-in-bulk-from-the-admin-orders-page 
Admin, orders list page: send invoices per email in bulk
 2023-03-17 10:58:26 +00:00
David Cook
788457618f Check ship address required based on all available methods 
This check was implemented based on 'allowed' shipping methods, but we need to revert that logic. So for now, we can check all 'available' shipping methods.

This could potentially result in the same query being run twice, because load_shipping_methods also loads it. I opted to keep things simple and not try to optimise here.
 2023-03-17 13:06:45 +11:00
David Cook
ef607da2c1 Revert "Fix: Customers can checkout with non-matching shipping and product categories" 2023-03-17 10:40:53 +11:00
Filipe
9ea6fa5c44 Merge pull request #9687 from dacook/9616-order-cycle-open-webhook 
Add webhook triggered on Order Cycle Open
 2023-03-16 17:24:22 +00:00
Konrad
a945f8f72f Merge pull request #10522 from mkllnk/flipper-upgrade 
Bump flipper* from 0.20.4 to 0.26.0
 2023-03-16 17:24:33 +01:00
Filipe
e8430eae6d Merge pull request #10460 from jibees/10400-pagination-in-bom-not-aggregating-results-from-quick-search-field 
BOM: Add a search input that search for items with pagination
 2023-03-15 16:31:32 +00:00
Maikel Linke
fdd71cff51 Remove now unnecessary flipper_id method 
Flipper does it for us.
 2023-03-15 12:54:02 +11:00
vviekk
c1c0eca7c4 Enable invoices config only controls Print bulk action 2023-03-13 11:39:21 +05:30
David Cook
fdeeab5750 Test twitter with (almost) real world example 
I discovered that twitter doesn't have 'www' in the url anymore, no '@' symbol and interestingly no trailing slash. I added back the '@' just so we can test that still.

Using a regex group we can cater for optional www in a single regex.
 2023-03-09 11:22:04 +11:00
David Cook
9e7e176cf9 Accept full URLs 
It looks like the intention was there, so I made it work.
I've included a real world example, but added capitalisation to complete the test.
 2023-03-09 11:21:52 +11:00
Konrad
2daa49406a Merge pull request #10506 from jibees/9868-product-import-empty-variant-names-recorded-differently-leads-to-variant-duplication 
Product import: consider `display_name` with `null` or `empty` as value as equal
 2023-03-08 16:58:32 +01:00
Konrad
125bc3d14b Merge pull request #10514 from jibees/9292-changes-to-incomingoutgoing-products-lists-triggering-failed-to-update-order-cycle-error 
Do not update `estimate_price` of a variant that is not available for the shop on OrderCycle update
 2023-03-08 15:45:11 +01:00
Rachel Arnould
02300d6bb6 Merge pull request #10496 from rioug/10479-split-checkout-fix-user-blocked-at-step1 
[split checkout] Fix bug preventing user from reaching payment step
 2023-03-08 15:44:50 +01:00
Rachel Arnould
aba3968bca Merge pull request #10447 from jibees/9148-no-bulk-delete-possible-on-bom-when-orders-have-multiple-items 
Admin, BOM: can bulk delete line items of an order
 2023-03-08 14:56:25 +01:00
Gaetan Craig-Riou
23c4298519 Fix bug when in specific scenario user couldn't proceed to payment step 
When using a "pick up" shipping method, with a user who doesn't have a shipping address it was impossible to proceed to the payment step because shipping address was invalid.

To fix this, we ensure that "ship_address_same_as_billing" parameter is set to true when using a "pick up" shipping method.

use distributor address when shipping method doesn't require a ship address ; in doing this we follow the same logic as the legacy checkout
 2023-03-08 10:49:37 +01:00
Jean-Baptiste Bellet
40a0d8e08c Improve design: make delete not a button but a link + close to file name 2023-03-08 10:38:28 +01:00
Jean-Baptiste Bellet
5cbec5521c Simplify ability 
Co-Authored-By: David Cook <david@redcliffs.net>
 2023-03-08 10:38:28 +01:00
Rachel Arnould
d7047bb4cc Merge pull request #10513 from jibees/10505-add-shopper-comment-to-order-detail-summary 
SplitCheckout: Display special_instructions of the order as emphasized text if present on summary page
 2023-03-08 10:30:40 +01:00
binarygit
8f6fdf3e31 [Admin, Enterprise Settings] Remove Angular from Business Details tab 2023-03-08 10:26:05 +01:00
Rachel Arnould
1ce029d8e4 Merge pull request #10497 from jibees/10495-split-checkout-label-of-checkbox-save-card-for-future-use-is-clickable-but-not-active 
SplitCheckout: Make label clickable to check/uncheck checkbox on step 2
 2023-03-08 10:20:00 +01:00
David Cook
00a823b2fc 6. Add webhook endpoints to user developer settings screen 
Allowing creation and deleting via the user association.
It probably won't be much effort to allow editing and multiple records, but I cut it down to the minimum needed to avoid any further delays.

I couldn't find a way to test a failure in the destroy method, but decided to keep the condition because I thought it was worth having.
 2023-03-07 15:38:50 +11:00
David Cook
3d81a6e280 Prevent creating duplicate webhook notifications [migration] 
Using the clever concurrency testing borrowed from SubscriptionPlacementJob, but I thought a shorter pause time (just 100ms) would be sufficient.

I considered doing this with a new 'state' field (upcoming/open/close), but decided to keep it simple.
 2023-03-07 15:38:50 +11:00