raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,630 Commits 16 Branches 456 Tags
e6e4e014dc95da76a6d96cea21fa2fa45380cf21
Commit Graph

15511 Commits

Author SHA1 Message Date
Filipe
771bd93f5f Merge pull request #11677 from rioug/11359-vouchers-fix-tax-moving-back-in-checkout 
[vouchers] fix tax calculation when moving back in the checkout process
 2023-11-02 17:02:08 +00:00
Maikel
6a236a8678 Revert "replace hiredis gem with hiredis-client" 2023-11-01 15:16:57 +11:00
Maikel
e6e2f27ed4 Merge pull request #11736 from dacook/registration-noindex 
Print robots tag for registration layout
 2023-11-01 13:53:07 +11:00
Maikel
25a3149f48 Merge pull request #11702 from dacook/buu-editing-part5b-11059 
[BUU] Mark changed fields, when error
 2023-11-01 13:01:08 +11:00
Maikel
e85a1cef7e Merge pull request #11708 from abdellani/test-redis-5 
replace hiredis gem with hiredis-client
 2023-11-01 10:02:25 +11:00
David Cook
435bf6e6b0 Print robots tag for registration layout 
This is copied from the darkswarm layout.
 2023-10-31 14:03:32 +11:00
Mohamed ABDELLANI
6d0f7d7c81 render null shipment when shipment adjustment doesn't exist 2023-10-30 22:53:19 +01:00
Mohamed ABDELLANI
23a56d35a0 add tax_adjustment total to the invoice 2023-10-30 22:09:22 +01:00
Mohamed ABDELLANI
e16df2777a optimize DataPresenter#checkout_adjustments 
reduce the complexity of the method
 2023-10-30 21:58:37 +01:00
Mohamed ABDELLANI
c8f69c8778 always render shipment on the invoice 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
c513eb5d9d fix existing test 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
15aeb2f8e5 remove legacy template (used when invoice feature enable) 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
da89860f35 fix price per unit 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
c1ed8ed67c update the adjustments rows 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
716cf3e522 reorder the totals section 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
b7f601d140 show tax rate column regardless of the tax amount on the order 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a08a2fd5f6 [skip ci] add terms of service link to the invoice. 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a5fd0608c3 align the columns of the totals rows 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a8f9b29a6d [skip ci]add the total price columns to the invoice 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
30537f7743 add "Weight/VOL." column to the invoice 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
b64058a71d swap tax rate with total price (incl tax) 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
1182544c47 update the view used when the invoice feature is enabled 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
4634c2d965 add unit_price_price_and_unit to line_item serializer 
*  unit_price_price_and_unit refers UnitPrice which refers to other attributes
that belong to variant and product.
Instead of collecting all the attributes that were using indirectly by the method and adding them to the serializers
I perefered to serialize the result of the method call.
 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
affecf53c6 add order cycle name to the invoice number section 2023-10-30 19:43:57 +01:00
cyrillefr
31cc0494c2 Icon for the new action 
- Similar to the actual capture action
 2023-10-29 22:05:34 +01:00
cyrillefr
e1374d5837 Add Order completion after capturing event 
- A new processing method
- Payment means that link to it
- Altering methods that handle next status choice
 2023-10-29 21:58:03 +01:00
cyrillefr
cd6c3c45e6 Allow an order in confirmation state to transition to payment 2023-10-29 21:58:03 +01:00
Ahmed Ejaz
df773aaee9 Merge branch 'master' into bugfix/11667-clone-tags-issue-for-OC 2023-10-28 14:57:43 +05:00
Ahmed Ejaz
0e0b322707 #11667, assign tag_list to cloned exchange tag_list 2023-10-28 14:02:44 +05:00
Gaetan Craig-Riou
33de80f13c Fix checking if shipping method changed 
We now check if the shipping method changed before we actually select
it. Fix the related spec.The spec was wrong because order.select_shipping_method
fails silently. That means the shipping method wasn't getting
updated on the order, thus the test was passing.
 2023-10-27 14:20:31 +11:00
Filipe
f1d4ec9fe7 Merge pull request #11684 from ccozkan/issue-11609 
Fix content aligning in subscriptions table
 2023-10-26 16:20:33 +01:00
Filipe
b67acaae21 Merge pull request #11694 from prateek0411999/bugfix/11666-warning_forfeit_remaining_amount 
add condition on warning_forfeit_remaining_amount note
 2023-10-26 13:44:22 +01:00
Filipe
3da8341946 Merge pull request #11695 from ccozkan/issue-8943 
Make update button on enterprises primary details form clickable upon input to name field
 2023-10-26 13:12:27 +01:00
Mohamed ABDELLANI
d6890e9828 check key class before call Rails.cache.delete 2023-10-26 10:27:00 +01:00
Çağrı Özkan
7b21126a9c Use both onchange and oninput on ng_form.html.haml 2023-10-25 17:32:25 +03:00
Çağrı Özkan
38d1de896c Use oninput on ng_form.html.haml instead of onchange 2023-10-25 17:11:30 +03:00
David Cook
671dc570ec Refactor: with form builder 2023-10-24 15:21:14 +11:00
David Cook
aa4630d74c Mark fields as changed if they contain unsaved values. 
This can happen when there's a validation error. The field with error will also be marked changed, but the error style will override it.

I'd like to move this into a FormBuilder. Existing formbuilder gems don't seem to support it (though I didn't look very hard).
 2023-10-24 15:21:14 +11:00
David Cook
04032e61e2 Prettier 2023-10-24 15:21:13 +11:00
David Cook
fdad45bb46 Rename 'modified' state to 'changed' 
This conveniently matches the terminology used in both JavaScript and ActiveModel::Dirty.
 2023-10-24 15:21:13 +11:00
David Cook
ceb9d9af92 Add comment 
I decided to look into why this is so complicated, in case some of the complexity can be removed. It can't :(
 2023-10-24 15:21:13 +11:00
David Cook
1534908895 Move generic method to base class 
Because rubocop complained about the size of ProductSet.
 2023-10-24 15:21:13 +11:00
David Cook
224b6f514b Remove concept of master variant 
from old bulk product screen. Hmm I just realised we're deleting that screen soon anyway.

But this helps clean up the spec before I refactor it further.
 2023-10-24 15:21:13 +11:00
Neal Chambers
dc607b654d Fix Style/HashSyntax 2023-10-24 08:49:34 +09:00
prateek0411999
a113b5ba01 add condition on warning_forfeit_remaining_amount note 2023-10-23 10:45:35 +05:30
Gaetan Craig-Riou
d5d043880a Fix scenario when no shipment available 
I though that once the shipping method was set it's available on the
order, but apparently it's not always the case. At least some of the
test scenario have order with no shipment, thus no shipping method set.
 2023-10-23 15:38:01 +11:00
Gaetan Craig-Riou
25af178011 Refactor updating order state 
It makes the code a bit easier to read
 2023-10-23 15:37:53 +11:00
Çağrı Özkan
e465015184 Add oninput:"make form dirty" to enterprise_form/name text field 2023-10-21 01:19:41 +03:00
Konrad
2ba5ab7dc1 Merge pull request #11577 from jibees/10956-use-cable_ready-instead-of-morph 
Admin, Orders list: when capturing an order, fix an issue that makes the tooltip invisible (+ errors in the console)
 2023-10-20 11:56:53 +02:00
Gaetan Craig-Riou
5ba21e486a Recalculate voucher voucher adjusment when needed 
We need to recalculate the voucher adjustment(s) in the following
scenarii :
When a voucher as been added to the order and :
  * Moving to the payment step from details step, to take into account
    potential change in shipment fees. (this happen if we return to the
    details step after reaching the summary step)
  * Moving to the summary step from payment step, to take into account
    payment fees
 2023-10-20 16:49:21 +11:00