raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,833 Commits 21 Branches 450 Tags
5f4aed92d81114df87516be076b5162f9511e4e8
Commit Graph

13873 Commits

Author SHA1 Message Date
Rachel Arnould
7a62a95e0b Merge pull request #10103 from binarygit/stop-horizontal-scroll-of-body-in-order-summary-page 
[Split Checkout] Stop horizontal scroll on body in order summary page
 2022-12-23 10:29:21 +01:00
Filipe
944d552f6b Merge pull request #10156 from ijdershem/idersh/issue-9834-pt3 
[OFN-9834-PT3] Add placeholder for new product supplier field
 2022-12-22 15:42:38 +00:00
Filipe
c3e4c53a01 Merge pull request #10074 from binarygit/order-cycle-closes-during-split-co 
Redirect to shopfront when Order cycle closes during split checkout
 2022-12-22 15:09:57 +00:00
Filipe
ae59621341 Merge pull request #10174 from ijdershem/idersh/OFN-9870 
[OFN-9870] Correct error message for differing variant_unit_name for same product in import
 2022-12-22 11:20:12 +00:00
Filipe
d61affd82b Merge pull request #10093 from vviekk/viv/noneTranslate 
Translating text 'None' for tax and shipping categories of the product
 2022-12-21 21:45:05 +00:00
ijdershem-jf
18e9aba6b8 [OFN-9870] Display accurate error message for differing variant_unit_name for same product in import 2022-12-20 08:19:47 -07:00
Filipe
561458ce43 Merge pull request #9933 from Laurel16/instagram 
Admin, Enterprise Settings, Social: Add instagram handler validator
 2022-12-20 12:40:57 +00:00
Filipe
6f3d27b99b Merge pull request #10089 from abdellani/fix-payment-non-3d-need-to-be-manually-captured-in-BO 
Fix Payments with non-3D cards need to be manually captured in the BO (Split checkout)
 2022-12-20 10:09:45 +00:00
binarygit
3b179e75a4 Stop horizontal scroll on body in cart page 2022-12-19 21:30:31 +05:45
Filipe
006ad6be73 Merge pull request #9929 from abdellani/fix-available-shipping-payment-methods-dont-respect-oc-setting 
fix payment methods loading on multi-distributor order cycle checkout page
 2022-12-15 17:05:03 +00:00
Filipe
d995e7630c Merge pull request #10076 from abdellani/fix-available-shipping-methods-dont-respect-oc-setting 
Fix available shipping methods dont respect oc setting
 2022-12-15 16:52:16 +00:00
ijdershem-jf
741dc0e29c [9834-PT3] Add en translation for new product supplier select placeholder 2022-12-14 20:35:19 -07:00
Filipe
d801b6e970 Merge pull request #10102 from binarygit/enable-save-btn-after-removing-fee 
[Admin][Order Cycle] Enable save btn after removing fee
 2022-12-14 17:13:32 +00:00
Rachel Arnould
fd95970774 Merge pull request #8996 from jibees/introduce-backoffice-ui-uplift 
Introduce backoffice UI uplift
 2022-12-14 14:20:43 +01:00
ijdershem-jf
ea45462e50 [9834-PT3] Add placeholder/default select option for new product supplier field 2022-12-13 18:17:49 -07:00
Rachel Arnould
f3d82b41ad Merge pull request #10108 from binarygit/transparent-bg-in-ff 
Fix: Transparent background of 'Complete Order' area on Firefox mobile
 2022-12-13 17:34:52 +01:00
Jean-Baptiste Bellet
a8278446b3 Simplify the way we render the name column 2022-12-12 15:20:30 +01:00
Jean-Baptiste Bellet
10bfe00123 Rename column "Name" 2022-12-12 15:20:30 +01:00
Mohamed ABDELLANI
9fbdb311b0 Update app/services/order_available_payment_methods.rb 
Co-authored-by: jibees <jb.bellet@gmail.com>
 2022-12-10 11:51:35 +01:00
Laurel16
bfd396e644 Add instagram handler validator 
update entreprise model to match the correct pattern for instagram attribute & add migration to correct wrong links in db + test
 2022-12-08 15:22:05 +01:00
Mohamed ABDELLANI
84aedaa1a1 run process_payments before order confirmation 2022-12-08 11:13:54 +01:00
Filipe
996d3afe4f Merge pull request #9983 from cillian/remove-exchange-tags-n1-query 
Remove N+1 query loading tags for each order cycle exchange
 2022-12-07 17:38:41 +00:00
Jean-Baptiste Bellet
500c4e8a2f Already handled by app/webpacker/controllers/index.js 
Controller were instanced twice.
 2022-12-07 15:38:20 +01:00
Jean-Baptiste Bellet
5002870b39 Add missing i18n translation for PaginationComponent 2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet
ec31d63c58 Do not import/initialize twice 
Already done in "controllers"
 2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet
9dfc22451e Selectors are close by default 2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet
3cf01623da Handle filtering on js controller for SelectorWithFilter 2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet
274ee2c6f6 Toggle is now controlled by the browser (and don't requires a reflex) 2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet
940b554d23 Toggle is now controlled by the browser (and don't requires a reflex) 2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet
91d1ecea2e Click the whole Selector instead of arrow only 2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet
fbf2315a93 Rename SuperSelector to SelectorWithFilter 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
20218c00ab Manage i18n for ProductsTable component 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
18adcb7fa4 Handle i18n for SuperSelector component 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
56b94342eb Manage i18n for SearchInput component 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
758c40c646 Manage i18n for Products page 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
98391b60c6 Use CSS vars to match linter 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
3e03208cf5 Add loading state for ProductsTable component 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
3ae5db907a Create js controller for ProductsTable component 
Handle before/after reflex lifecycle methods on client side
Add 'loading" class on products-table component
 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
27c1fe2f06 Add search query input to search for product by name 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
122677bc7a Create SearchInput component 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
22d13621f4 Only send close reflex if element is actually visible 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
265b4823a7 Add static var + freeze 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
5e689fcce3 No need to fetch as it's done inside beforeReflex lifecycle method 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
e801bb5e40 some CSS linter 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
d75c62a621 Add TableHeader component and better columns implementation 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
1de7fb6fe8 Create TableHeader component 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
d37cd09c84 Use the reflex_data_attributes helper method 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
cb24efbc4a Some styling improvments 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
c23d4f63ed Add pagination to ProductsTable component 2022-12-07 15:08:53 +01:00
Jean-Baptiste Bellet
c7197364d1 Add a pagination component that handle pagy 2022-12-07 15:08:53 +01:00