Konrad
d7c39fcab7
Merge pull request #13297 from filipefurtad0/fix_#13264_BOM
...
Fixes bad display from Producer name on BOM page
2025-05-23 18:56:36 +02:00
Konrad
60914ac8cc
Merge pull request #13326 from mcmpp/instance_configuration_options_inline
...
Change the layout for instance configuration options
2025-05-19 15:28:40 +02:00
Konrad
6432eceee5
Merge pull request #13313 from cyrillefr/FilterSelectionListNotDisplayingFullNames
...
Fixes dotted shipping method names bad display in select (filters)
2025-05-16 19:58:13 +02:00
Filipe
3efa2832de
Merge pull request #13257 from ashishp91/13221-make-shipped-orders-uneditable
...
13221 - Don't allow shipped orders to be editable
2025-05-15 19:23:33 +01:00
Mikel Cordovilla
f767437f5a
Display instance config checkboxes inline
2025-05-15 11:46:04 +02:00
Mikel Cordovilla
559a85e4f2
In the instance configuration some of the options displayed as block instead of inline
2025-05-14 15:36:55 +02:00
cyrillefr
e61d951dcf
Requested changes - translation useless
...
- also useless in specs
2025-05-12 14:46:27 +02:00
cyrillefr
36cada0510
Fixes dotted shipping method names bad display in select
2025-05-09 10:26:49 +02:00
Ashish Gaur
475cfdc8f0
Show cannot add item to shipped order in the Add products section
2025-05-05 20:03:47 +05:30
Ashish Gaur
42e2d3cdd5
13221 - Don't allow shipped orders to be editable
2025-05-05 20:03:47 +05:30
filipefurtad0
44e02b76f9
Adds the ng-bind html parameter to the producer column
2025-05-03 16:58:00 +01:00
Jordan 'slothmock' Mock
0be87314df
Fix #11967 - limit variant unit name input to 20 characters
2025-05-01 23:45:41 +01:00
Jordan 'slothmock' Mock
35198cebcb
Fix #11967 - limit variant unit name input to 20 characters
2025-05-01 23:33:07 +01:00
David Cook
e900c95213
Merge pull request #13276 from filipefurtad0/pagy_pagination_spec
...
Adds coverage to pagination (pagy bump)
2025-04-28 13:18:58 +10:00
filipefurtad0
c8a91a9d44
Fixes deprecation on trailing hashes for sort_link
...
Running the spec was pointing to the following deprecation - Passing two trailing hashes to is deprecated, merge the trailing hashes into a single one. (called at /home/ffurtado/openfoodnetwork/app/views/spree/admin/users/index.html.haml:16)
2025-04-23 19:45:06 +01:00
Konrad
f63552ca38
Deletes remaining text versions of emails
...
This is in preparation for advancing the white labelling feature of emails and adding more specs in that regard
Related discussion on Slack: https://openfoodnetwork.slack.com/archives/C2GQ45KNU/p1722902361401869?thread_ts=1721485724.245519&cid=C2GQ45KNU
2025-04-21 20:11:50 +02:00
Ahmed Ejaz
4e2198cd4f
hide shipping icons from suppliers
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
bf6934db94
add specs
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
bc3917ebc1
incorporate show_customer_names_to_suppliers setting
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
4bc578f38f
restrict page sections from supplier
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
19c5fec9a9
add ability update supplier line_items in orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0a61910cf6
add ability to view supplier products containing orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
806965b2cd
add textarea field plus the preformatted tag to display paragraph formatting in the notes
2025-03-24 00:43:07 +05:00
Ahmed Ejaz
86f5385aec
13179: fix notes field length issue
...
- notes field was a children of label element
- due to this its size was bound by the label element
- now this commit makes it a sibling, making it occupy the width of column width
2025-03-16 16:00:56 +05:00
David Cook
9adf3a22af
Show only first 25 enterprises
...
I thought about reducing it further, but maybe people are used to having a large list. Let's see how this performs
2025-03-03 14:46:24 +01:00
David Cook
5a1190cdda
Remove superfluous %div from haml elements with class
...
Div is the default element in HAML, so we don't need to specify it. https://haml.info/docs/yardoc/file.REFERENCE.html#implicit-div-elements
2025-03-03 14:46:24 +01:00
Filipe
feccef0b36
Merge pull request #13157 from drummer83/email_styled_password
...
Create styled email for reset password instructions
2025-02-27 16:53:04 -06:00
David Cook
b370b207b5
Automatically bind toggleCheckbox action
2025-02-20 12:14:49 +11:00
David Cook
b92c046119
Automatically bind toggleAll action
...
We are already specifying the element's role ('all') in the HTML. Its behaviour should be predefined; there's no need to also specify in the HTML.
The eventhandler doesn't need to be cleand up on disconnect, because they are removed along with the DOM object.
2025-02-20 11:24:21 +11:00
drummer83
e98fa485b5
Quick beautification of test email
2025-02-16 19:50:18 +01:00
drummer83
4dc0f0e5be
Create styled email for reset password instructions
2025-02-16 19:12:56 +01:00
Filipe
32c4b4557b
Merge pull request #13086 from rioug/fix-tax-rate-refund
...
Remove tax rate refund code path
2025-01-30 21:54:30 -06:00
Filipe
e2161660b3
Merge pull request #13090 from mkllnk/replace-spree-roles
...
Replace spree roles
2025-01-30 21:30:56 -06:00
Gaetan Craig-Riou
d4a060c6a2
Fix Zone system spec
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
f7998f6570
Fix zone new form to allow adding state or country
2025-01-27 11:01:07 +11:00
Konrad
01036e6321
Merge pull request #13087 from mkllnk/stock-location
...
Remove class Spree::StockLocation
2025-01-25 12:41:37 +01:00
Filipe
5d360730c7
Merge pull request #13023 from rioug/12907-fix-checkout-shipping-fee
...
[Checkout] Shipping fees update, remove order callback
2025-01-23 18:50:31 -06:00
Maikel Linke
d49cea5e3d
Use admin flag instead of user role
2025-01-22 14:59:49 +11:00
Maikel Linke
187a78b78d
Remove stock location from add-variant JS
2025-01-22 11:58:15 +11:00
Maikel Linke
87d20877ad
Remove Shipment#stock_location
2025-01-22 11:20:05 +11:00
Gaetan Craig-Riou
c71ae35685
Fix payment_total calculation
...
For payment that complete during the checkout (Paypal, Stripe) the
amount was recorded twice against `order.payment_total`. This is because
the `payment_total` gets updated in an afer_save Payment callback when a
payment is completed, and then once more when we process payment in
`Spree::Order#process_each_payment`.
This is an existing issue on master, but it was hidden by the
`update_shipping_fees!` callback, it trigerred an update of the order's
total, which then updated `order.payment_total` with the correct value.
Now that we removed the callback, the bug showed up.
Note, I updated the stripe specs for consistency even though they are
currently disabled.
2025-01-20 16:07:32 +11:00
Filipe
ace3bfa2a5
Merge pull request #13061 from kernal053/add-voucher-label-to-edit-cart-page
...
Add 'Voucher:' before voucher code on edit cart page
2025-01-16 22:51:57 -06:00
Filipe
3c1dd10219
Merge pull request #13047 from mkllnk/spree-roles
...
Clarify that our only user role is "admin" and simplify code
2025-01-16 18:06:49 -06:00
Konrad
428eb465c0
Merge pull request #13009 from MrBowmanXD/dev
...
Added the :selected option with the default tax category #12989
2025-01-07 20:04:28 +01:00
kernal053
45a4b33920
Ensure existing format 'Voucher: Code' on edit cart page. Handle rubocop warning
2025-01-07 09:17:24 +05:30
kernal053
98adefbd67
Add 'Voucher:' before voucher code on edit cart page. Add spec correspondigly
2025-01-04 14:26:02 +05:30
kernal053
bad32e226e
Fix label for other adjustments and add spec correspodingly
2025-01-02 16:29:48 +01:00
kernal053
65abda2a38
add voucher label & correspoding code with translation for order confirmation mailer
2025-01-02 16:29:48 +01:00
kernal053
f99f2c81ac
Add 'Voucher:' before voucher code on order confirmation emails
2025-01-02 16:29:48 +01:00
Maikel Linke
a7140d1f60
Use only admin role, on demand
...
We are now creating the role on demand which removes the need for
seeding it as well.
2024-12-19 09:02:04 +11:00
