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
32,292 Commits 19 Branches 453 Tags
7d3eff2abb87f636250abbed7726f02cd16f2a29
Commit Graph

939 Commits

Author SHA1 Message Date
wandji20
c2e0c94f2e Remove unused debounced plugin 2024-09-17 11:56:07 +01:00
wandji20
a8db288425 Improve debounced initialised events 2024-09-17 01:56:44 +01:00
Konrad
afc4c1e967 Merge pull request #12760 from wandji20/wb-OFN-12744 
UX improvements for creation of new products [OFN-12744]
 2024-08-29 17:22:36 +02:00
Filipe
2817b8891e Merge pull request #12814 from dacook/buu/cell-padding 
Increase column space in bulk products table
 2024-08-28 21:30:03 -06:00
Filipe
ab87610d91 Merge pull request #12807 from kernal053/fix-broken-column-after-cloning 
Fix broken column after cloning product
 2024-08-28 21:03:53 -06:00
David Cook
5324747f89 Reduce cell padding 
This is closer to the original design:
* 6px between inputs
* 6px vertical padding on condensed rows
* 12px vertical padding on relaxed rows

Note that 'relaxed' rows are now smaller than the regular rows, which was not the original intention. But we haven't got spare time to do a broader review of table styles right now.
 2024-08-26 16:53:19 +10:00
Gaetan Craig-Riou
ef2856d169 Remove added eventListener on disconnect 
It's good practise to remove added event listener to avoid memory leak
 2024-08-26 11:15:26 +10:00
kernal053
e35a5179bb Fix broken column after cloning product 2024-08-23 16:01:56 +05:30
wandji20
7417cee20a Fix leaked trix editor event listener [OFN-12744] 2024-08-23 09:57:37 +01:00
Maikel
e9c7e1778c Merge pull request #12782 from mkllnk/reports 
Add fallback report loading in case websockets fail
 2024-08-23 09:23:42 +10:00
Konrad
25b1620707 Merge pull request #12743 from wandji20/wb-OFN-12214 
(Fix) chore(deps): bump wicked_pdf from 2.6.3 to 2.8.0 [OFN-12214]
 2024-08-22 17:34:20 +02:00
Konrad
ae6182579b Merge pull request #12762 from EdwardLi-coder/change_colour_of_complete_order 
change colour of "complete order"
 2024-08-18 15:08:46 +02:00
Maikel Linke
d354317c73 Replace cable_ready report loading w/ Turbo stream 
I'm adding TurboPower for the scroll_into_view action. It adds all the
nice CableReady actions to Turbo Streams.

Note that I omitted `block: "start"` because that option is the default
in Javascript. And the generic `action` method doesn't support
parameters like this anyway. I'll work on that in the next commit.

I also re-introduced a race condition by rendering the "loading"
indicator after triggering the report rendering job. I'm planning to
resolve that later.
 2024-08-16 14:37:57 +10:00
Konrad
503148b13b Merge pull request #12653 from wandji20/wb-OFN-11613 
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
 2024-08-14 18:14:33 +02:00
wandji20
7392079d4d Move mail related styles to asset pipeline [OFN-12214] 2024-08-13 17:11:29 +01:00
EdwardLi-coder
93a6ff4b50 remove background-color 2024-08-13 09:38:20 +08:00
wandji20
a85cfab506 Remove awesome nested set gem and dependencies [OFN-11636] 2024-08-12 18:47:16 +01:00
Gaetan Craig-Riou
43d983cac2 Remoce left over console.log 2024-08-12 09:05:48 +01:00
wandji20
ad3e772944 Refactor and update order cycle form controller [OFN-11613] 2024-08-12 09:05:48 +01:00
wandji20
6a438a07fe Add stimulus controler to monitor order cycle status message data attribute change and trigger warning modal [OFN-11613] 2024-08-12 09:05:48 +01:00
wandji20
ea238829a8 Revert front end validation and implement backend validation for changes in datetime order cycle values [OFN-11613] 2024-08-12 09:05:48 +01:00
wandji20
91fddeaa8b Fix failing spec [OFN-11613] 2024-08-12 09:05:48 +01:00
wandji20
0de8a90b14 Add warning modal to order cycle with attached schedule general setting form [OFN-11613] 2024-08-12 09:05:48 +01:00
EdwardLi-coder
97a72dfde7 change colour of "complete order" 2024-08-12 12:01:02 +08:00
Filipe
fcb0996a76 Merge pull request #12713 from dacook/buu/style-fixes2 
[BUU] Style fixes
 2024-08-08 17:31:20 +01:00
Rachel Arnould
f51705cb57 Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550 
Add "Affiliate Sales Data" connected app option
 2024-07-30 16:14:27 +02:00
David Cook
ec3c157f1e Add gap between elements 
It could be done better, but requires more code cleanup than it's worth.
 2024-07-29 15:20:36 +10:00
David Cook
32aacbd2b0 Don't use fixed heights 🔥 
Just don't. It makes life hard and doesn't solve the problem properly.

Now, when the content doesn't fit within the screen width, it will flow naturally and not jump up and down all over other elements.
 2024-07-29 15:13:30 +10:00
David Cook
655dc92246 Clean up wacky input styles 🔥 
Trying to style a pretend input just doesn't work in practice, it resulted in a couple of style issues.
Let's keep it simple,
 2024-07-29 15:02:06 +10:00
Konrad
00a0006ff2 Merge pull request #12691 from ccozkan/use-vertical-transitions-for-cloning-and-deleting 
Use vertical transitions for cloning and deleting products
 2024-07-28 18:25:07 +02:00
David Cook
1742d2807f Add affiliate sales data to form 2024-07-25 17:06:13 +10:00
Gaetan Craig-Riou
7f9bbd23e5 Revert fix introduced in https://github.com/openfoodfoundation/openfoodnetwork/issues/10685 
It breaks wit Safari on Iphone
 2024-07-22 14:59:30 +10:00
Çağrı Özkan
29d63b0f0f Change slide in animation to appear from top 2024-07-22 06:01:01 +03:00
Çağrı Özkan
25e9fd22d8 Change slide out animation to disappear towards top 2024-07-22 06:01:01 +03:00
Konrad
f0fd3bb73c Merge pull request #12635 from wandji20/wb-OFN-10685 
(Fix) Product description not correctly truncated
 2024-07-09 19:51:46 +02:00
Konrad
d60d29b685 Merge pull request #12634 from chahmedejaz/bugfix/12632-voucher-field-focus-issue 
Fix Voucher Code Field Focus Issue
 2024-07-08 12:19:19 +02:00
wandji20
8a8a178683 Fix Product description not correctly truncated [OFN-10685] 2024-07-08 10:04:16 +01:00
David Cook
e62b640372 Poll to check when invoice file finished 
The BulkInvoiceJob already sends a notification via WebSockets once complete, but sometimes that fails. So this is added on top, just in case.
 2024-07-05 08:58:10 +10:00
Ahmed Ejaz
02c0c6aa5e 12632 - fix voucher field focus issue 
- when disabling or enabling the control, we should only focus it if it's not a button.
 2024-07-01 14:49:38 +05:00
Ahmed Ejaz
5a259f1b91 Merge branch 'master' into task/11987-remove-SR-from-clone 2024-06-26 16:18:42 +05:00
Konrad
f9e1ff9238 Merge pull request #12567 from mkllnk/flash-css-fix-v3 
Error messages don't block bottom of page clicks
 2024-06-20 17:22:02 +02:00
Ahmed Ejaz
4b9141f66d 11987 - add products table mutation listner 2024-06-20 12:44:55 +05:00
David Cook
b8f8d6d042 Show/hide columns with CSS selectors instead 
Well, that made the JS way simpler.

Adds a lot of classes though. Maybe we could do it based on column index instead, but this will do for now.
table.hide-col0 { td:nth-child(0) { display: none; } }
 2024-06-18 15:35:53 +10:00
Ahmed Ejaz
30528cab0f 11987: add slide-in animation for product clone 2024-06-17 22:58:36 +05:00
Maikel Linke
81a8ee5a31 Error messages don't block bottom of page clicks 
The flash container was set to 100% width to center the messages on the
screen. The messages were covering only part of the screen though. So
the container beyond the actual message box was covering part of the
page, blocking clicks on elements.

A new way of centering the container with CSS translate means that the
width of the container can be the same as the content, not covering
anyting accidentally.

And moving the whole container up instead of only moving the contained
message allows us to interact with elements below the flash message as
well.
 2024-06-13 11:20:54 +10:00
David Cook
d5456a85b7 Reset cell colspans 
This might be a little simpler if we move the 'new variant' button to col 0, and assume colspan cells always span the whole table.
 2024-06-13 10:09:02 +10:00
David Cook
70fab2bcc1 Show/hide columns using display instead of visibility 
Visibility was way simpler, but the table doesn't recalculate column widths until you use display:none;

This is now using the same method as the old products screen.
But we still need to update colspans..
 2024-06-13 10:08:56 +10:00
David Cook
0190d6f31d Update dropdown styles 
The v2 dropdown is used in various places, and now looks more in line with the new design.
 2024-06-13 10:08:02 +10:00
David Cook
8c75e6baa8 Make column selector a dropdown 
With some styling tweaks.
 2024-06-13 10:07:55 +10:00
David Cook
9ba3b4f2d5 Fix up styles 2024-06-12 14:58:09 +10:00