raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 19 Branches 453 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

14886 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
fc8cd30cce Add the tax_category_id for each adjustement 
- This tax_category_id could be null
 - Special case if the originator is a Spree::TaxRate: then use the tax_category_id of the originator

Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2021-10-28 15:04:43 +02:00
Matt-Yorkley
d1a91a53ea Merge pull request #8365 from lamphanqg/fix_menu_indicator 
Fix menu indicator on bulk order page
 2021-10-28 13:59:32 +01:00
Matt-Yorkley
f0ec739350 Merge pull request #8366 from lamphanqg/fix_bulk_buy_layout 
Fix broken layout of bulk buy
 2021-10-28 12:35:36 +01:00
Matt-Yorkley
462ff15f76 Remove Enterprise #inheritance_column 
Apparently this was part of an old feature from 2014...
 2021-10-28 10:44:23 +01:00
Maikel
2e8f4c1538 Merge pull request #8367 from bellvat/bug-show-error 
Add test and change order_cycle#show to redirect to edit page.
 2021-10-28 16:36:47 +11:00
Thierry Jet
5ebee9cd5f Translation stuff ready for Close button. Add close: key scoped spree.admin.date_picker in en.yml 2021-10-26 19:38:49 +02:00
Thierry Jet
66f754267b Customize spacing for shortcut-buttons into flatpickr 2021-10-26 14:40:42 +02:00
Thierry Jet
47e9692226 Add a close button to datepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:36:16 +02:00
Thierry Jet
c45e120ff8 Add a close button to datetimepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:33:02 +02:00
Luis Azcuaga
e8fd89a6d2 Run rubocop over existing todo 2021-10-25 21:28:28 -05:00
PHAN QUANG LAM
77524c633d Fix menu indicator on bulk order page 2021-10-26 06:41:30 +09:00
Sinan Chaush
aedacb1311 Missing navigation for super admin users only included 2021-10-24 22:34:38 +02:00
GeorgeThoppil
2c596fb2dd Adding regex op on long_description 2021-10-23 14:45:49 -04:00
jibees
fa7c64841f Merge pull request #8286 from mkllnk/permalink-check 
Avoid superfluous permalink check on site load
 2021-10-22 09:14:41 +02:00
jibees
a5a45539c3 Merge pull request #8308 from mariodz95/8250_fix_snail_when_editing_non_numeric_characters_on_enterprise_fees 
Fix snail when editing non numeric characters on enterprise fees
 2021-10-22 09:14:28 +02:00
jibees
e123353252 Merge pull request #8325 from achauve/3976-improve-error-handling-of-unsupported-image-formats 
Improve error handling of unsupported image formats
 2021-10-22 09:13:19 +02:00
jibees
2e846ce1e0 Merge pull request #8347 from achauve/8227-fix-opening-product-description-links-in-new-tabs 
Fix: product edition doesn't break description links
 2021-10-22 09:13:02 +02:00
jibees
741966b569 Merge pull request #8375 from jibees/8358-add-tax-category-to-line-item 
Add `tax_category_id` for a line_item
 2021-10-21 15:00:29 +02:00
Maikel
c642b98067 Merge pull request #8193 from jibees/8155-split-checkout-mobile-views 
Some responsive modifications for split checkout
 2021-10-20 11:48:57 +11:00
Monica Sirathanarun
ebaf96ddae Add test and change order_cycle#show to redirect to edit page. 2021-10-19 23:20:54 +07:00
mariodz95
578efa945e Fix snail when editing enterprise fees 2021-10-19 10:26:44 +02:00
mariodz95
d1160ec66a Fix snail on shipping method fees 2021-10-19 09:56:35 +02:00
Maikel
a271a66998 Merge pull request #8271 from sinansonmez/8176-preselect-supplier-when-only-one 
When creating a product, preselect the supplier if there is only one
 2021-10-19 14:12:00 +11:00
Adrien Chauve
bd3bea8025 Fix: product edition doesn't break description links 
-> otherwise product edition was breaking description links, which were
not opening in a new tab anymore.
 2021-10-18 11:29:33 +02:00
Jean-Baptiste Bellet
115dac3ca9 Add tax_category_id for a line_item 2021-10-18 10:56:27 +02:00
Adrien Chauve
c818ec5508 Fix image creation button title and icon 2021-10-17 22:47:12 +02:00
Adrien Chauve
3d6654a4b5 Cleanup errors on wrong image format 
-> Remove all duplicates and use the same error message than in product
creation.
 2021-10-17 22:47:12 +02:00
PHAN QUANG LAM
8a2a746c5e Fix broken layout of bulk buy 2021-10-17 07:30:07 +09:00
Adrien Chauve
ad56105d31 Display error messages on product image creation (not only edition) 2021-10-15 10:45:35 +02:00
Jean-Baptiste Bellet
e7c04a2dd6 Track event on Signin/Signup Modal View 
Event Category: SignIn/Signup
Event Action: Modal View
Event Name: the current url
 2021-10-12 15:26:11 +02:00
Jean-Baptiste Bellet
9fcd6cd215 Track event on Login Submit Success 
Event Category: SignIn/Signup
Event Action: Login Submit Success
Event Name: the current url
 2021-10-12 15:26:11 +02:00
Jean-Baptiste Bellet
969a7ef2d0 Track event on Signup Submit Success 
Event Category: SignIn/Signup
Event Action: Signup Submit Success
Event Name: the current url
 2021-10-12 15:25:59 +02:00
Jean-Baptiste Bellet
0faab42c2a Fix Ruby 2.7 warning"Using the last argument as keyword parameters is deprecated;" 
https://bloggie.io/@kinopyo/how-to-fix-ruby-2-7-warning-using-the-last-argument-as-keyword-parameters-is-deprecated
 2021-10-11 14:56:11 +02:00
Cillian O'Ruanaidh
2462d71ab5 When creating backoffice orders hide variants with no stock by default 
But let people include out of stock variants by checking a checkbox if they want.

Note, we only apply the variants in stock scope if a distributor is
present. I think this is because this search method is also used when
setting up subscriptions so I don't think we want to change the
behaviour there.

Co-authored-by: Maikel Linke <maikel@email.org.au>
 2021-10-08 13:13:32 +01:00
Jean-Baptiste Bellet
9bbccbbd46 Partials needs to be children of the columns div 
And then have the right margins
 2021-10-08 09:42:36 +02:00
Jean-Baptiste Bellet
0f7ba41896 Add the number of the step as a responsive span 
that could be displayed or not (small screens)
 2021-10-08 09:42:36 +02:00
Andy Brett
e4be521632 Merge pull request #8203 from YasuhiroYoshida/adjust-visibility-of-enterprises-on-hub 
Change visibilities of hubs on group page
 2021-10-07 08:00:37 -07:00
Andy Brett
40e701abcc Merge pull request #8280 from sinansonmez/50-make-home-page-labels-clickable 
Make home page labels clickable
 2021-10-07 07:59:52 -07:00
Nihal M. Kelanthodika
d85a109a21 Merge pull request #7973 from apricot12/HQ_address_in_business_details 2021-10-07 18:32:24 +05:30
Andy Brett
5da1c2f7bd Merge pull request #8288 from mkllnk/pending-changes 
Translate "Save Changes"
 2021-10-06 08:06:48 -07:00
Nihal M. Kelanthodika
82d9b041c9 Remove unnecessary spaces and newlines 2021-10-06 15:06:57 +05:30
Nihal M. Kelanthodika
c632442466 Update unused company field to 'unused' 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
b0dcf47481 Add translation for "Reset Form" button 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
06344ed7c4 Remove comments 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
aa58318723 Create a Reset form button that destroy the form itself 
- Thanks to the input hidden field. Its value is false, but when clicking on Reset form, this value changes to 'true' (and then the form is cleared)
 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
9b6cc187b6 Remove clear form checkbox (used via _destroy) 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
802c5c8c94 Create a secondary form button 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
786b198f4d Create an updateinput controller 
- that update the targets input value to the value stored in data attribute
 - Add tests
 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
49e93a6125 Add StimulusJS controllers via webpacker for the admin 2021-10-06 15:06:56 +05:30
Nihal
f6e66de52b Update phone validation to simple validation 2021-10-06 15:06:56 +05:30