Merchandise sales moneybird integration #3464

tmgdejong · 2023-10-30T15:12:26Z

Closes #1657.

Adds a way to sell merchandise via the site, such that the merchandise sale gets registered automatically and will be processed in Moneybird.

It works using Thadmin, where a board member can enter a Merchandise Sale shift to sell merchandise. this shift has as product list a unique list, containing all merchandise items. This list is generated and updated automatically.
Merchandise Sale shifts are also created automatically, on a daily basis, and on creating a new shift, all old Merchandise Sale shifts get locked, or deleted if there are 0 items sold.
Just like a normal shift sale, a payment and an external invoice get created, but next to this, a general journal document gets created as well. This allows us in Moneybird to add a general journal document, which creates a credit transaction on the merchandise stock ledger, linked with a debit transaction on the merchandise costs ledger.

~~2 'problems' that are still in the code:~~
~~- In the migration for a merchandise item, even though Python code is ran to retain our current merchandise items, this does not seem to work yet.~~
~~- When a general journal document is 'updated', we now remove it and simply create a new one. This should be implemented the same way as with external invoices, where an attribute id is saved.~~

@JobDoesburg @DeD1rk @nvoers let me know what you think!

author Thijs de Jong <[email protected]> 1697580318 +0200 committer movieminer <[email protected]> 1697613494 +0200 parent cb8b4d9 author Thijs de Jong <[email protected]> 1697580318 +0200 committer movieminer <[email protected]> 1697613467 +0200 Add purchase price to merchandise Update settings.py Update models.py Update models.py Update payables.py Update admin.py Update models.py Update models.py Update settings.py Update models.py Update payables.py Update models.py Add purchase price to merchandise Update settings.py Update models.py Update payables.py Update admin.py Update models.py Update settings.py Update models.py Update payables.py Update models.py Add purchase price to merchandise

…svthalia/concrexit into merchandise-sales-moneybird-integration

DeD1rk · 2023-10-30T15:22:00Z

I don't really see an advantage in using sales here, as opposed to making e.g. a MerchandiseSale payable model. If we had a way to make miscellaneous payment requests (#3453) would any of this still be necessary?

tmgdejong · 2023-10-30T16:14:36Z

I don't really see an advantage in using sales here, as opposed to making e.g. a MerchandiseSale payable model. If we had a way to make miscellaneous payment requests (#3453) would any of this still be necessary?

The first implementation was with a MerchandiseSale payable model, see c708f32 and before. However, as @JobDoesburg mentioned, this way the board can go to thadmin.thalia.nu and use the continuous merchandise sale shift to add a sale, and the rest (payments, external invoices) will be handled by the already existing code.

Miscellaneous payment requests will not solve the problem of needing a general journal document for a merchandise sale to change the merchandise stock in moneybird.

website/merchandise/models.py

website/sales/signals.py

website/sales/services.py

website/sales/admin/product_admin.py

website/moneybirdsynchronization/services.py

website/moneybirdsynchronization/models.py

website/merchandise/migrations/0012_remove_merchandiseitem_id_and_more.py

website/moneybirdsynchronization/models.py

JobDoesburg · 2023-11-06T16:10:15Z

Looks good! Some more remarks that might be nice to account for, but are not important:

It is possible to change the price of the product list items to a different value than the price of the merchandise item. You can't really prevent that (except with setter and getter behavior specifically overriding this). But you might want to disable editing in the admin, simply by overriding the has_edit_permission and has_add_permission on the inline
Might be nice to add a help text specifying which values are incl and excl VAT

JobDoesburg · 2023-11-06T16:13:18Z

Also, I just realized, we might actually not want to make merchandise items actual sales products (extending the model like is implemented in this PR now). But only add a foreign key between them. Namely, we probably want to keep track of what sizes are sold, while we don't want to list every individual size on the website. So there should be a "t-shirt" in the merchandise app, and "T-shirt size L 22-23" in the sales app (with a foreign key to the merchandise app). That also simplifies the migrations

DeD1rk · 2023-11-06T18:49:18Z

I really don't like making sales depend on merchandise. While I haven't really looked into it yet, it does look like the added stuff from services can simply move into merchandise/services.

Regarding different sizes, a FK from product to merchandise item would be a nasty dependency, but how it is now seems fine (although it could just be a FK to product instead of inheritance) but if we want separate sizes IMO that should not use a FK from product (either a through model to emulate that without changing product, or e.g. make separate linked merchandise items and don't display some of them)

JobDoesburg · 2023-11-07T08:18:42Z

@movieminer @DeD1rk I have pushed one commit that changes the data model a little bit, to fix the things mentioned above. This does need some finishing touches, but I currently don't have the time. Feel free to work on it yourself, otherwise I might do it in the upcoming days

tmgdejong · 2023-11-07T10:22:00Z

I don't think we need to integrate different sizes in the site, since all the different sizes still cost the same, and we don't want to keep track of the sales in concrexit (since we also don't keep track of stock). The board still needs to note the sale in their cash book, and adding the sale to the site is more of a tool to register the sale in moneybird.

DeD1rk · 2023-11-07T12:42:02Z

I just moved the changes from sales to merchandise so the dependence is clean. I'll probably take a look at the rest in a few days

JobDoesburg · 2023-11-07T16:09:15Z

we don't want to keep track of the sales in concrexit (since we also don't keep track of stock). The board still needs to note the sale in their cash book

That's not the idea right? The website becomes the cash book as far as I understand it

JobDoesburg · 2023-11-12T21:58:52Z

@movieminer could you test if it still works for you? I think it should be ready now

DeD1rk · 2023-11-16T12:39:54Z

website/moneybirdsynchronization/models.py

@@ -54,6 +56,8 @@ def date_for_payable_model(obj) -> Union[datetime.datetime, datetime.date]:
        return obj.shift.start
    if isinstance(obj, (Registration, Renewal)):
        return obj.created_at.date()
+    if isinstance(obj, Order):


This is unreachable: there's already a branch for Order in line 55

DeD1rk · 2023-11-16T12:40:34Z

website/moneybirdsynchronization/models.py

@@ -41,6 +41,8 @@ def project_name_for_payable_model(obj) -> Optional[str]:
        return f"{obj.shift} [{start_date}]"
    if isinstance(obj, (Registration, Renewal)):
        return None
+    if isinstance(obj, Order):


This is unreachable

DeD1rk · 2023-11-16T12:41:05Z

website/moneybirdsynchronization/models.py

@@ -64,7 +68,10 @@ def period_for_payable_model(obj) -> Optional[str]:
            # Only bill for the start date, ignore the until date.
            date = obj.membership.since
            return f"{date.strftime('%Y%m%d')}..{date.strftime('%Y%m%d')}"
-    return None
+    if isinstance(obj, Order):


This would be incorrect for normal sales orders

DeD1rk · 2023-11-16T12:42:10Z

website/moneybirdsynchronization/models.py

+    if isinstance(obj, Order):
+        return settings.MONEYBIRD_MERCHANDISE_SALES_LEDGER_ID
+
+    raise ValueError(f"Unknown payable model {obj}")


I think it should just return none for the payables right?

JobDoesburg · 2023-11-25T13:31:15Z

I just realized we actually had to sync things even differently

ColonelPhantom · 2024-10-09T18:56:42Z

This seems pretty stale. Do we still want to do anything with this?

T8902 · 2024-11-06T19:22:07Z

@tmgdejong Im going to close this due to no activity

tmgdejong added 13 commits October 26, 2023 15:16

Implement merchandise sale in backend and to mb

23246b3

Correct ledger and small fixes

6ee7177

Textual changes

23f8672

Remove TPay and Wire as options

c708f32

Switch merchandise sales to sales

26e69ca

Continuing merch sales

c4aa4c5

Continuing merch sales

393cbeb

Small changes

3859882

Merge branch 'master' into merchandise-sales-

9dc3e03

Fix migrations

97d2aa2

Removed comment

f3e58f3

Merge branch 'merchandise-sales-moneybird-integration' of github.com:…

2cca5d7

…svthalia/concrexit into merchandise-sales-moneybird-integration

JobDoesburg suggested changes Oct 30, 2023

View reviewed changes

tmgdejong added 7 commits October 31, 2023 16:47

Some small changes wrt classes and names

c76f085

Small fix

9a8b60b

Merge branch 'master' into merchandise-sales-moneybird-integration

4e32bea

Added attribute id

4df93b9

correct api call for attr id

28f853f

Fixed migration

a95af92

Small fixes

8f3fee0

JobDoesburg suggested changes Nov 1, 2023

View reviewed changes

website/moneybirdsynchronization/models.py Show resolved Hide resolved

tmgdejong added 3 commits November 6, 2023 16:37

Add merchandise item syncing to Moneybird

0868f73

Merge branch 'master' into merchandise-sales-moneybird-integration

ccb02cd

Remove unused import

8a8b28f

tmgdejong requested a review from JobDoesburg November 6, 2023 15:44

Rewrite to FKs

f75feb3

Move changes to merchandise

540dc55

DeD1rk added the feature Issues regarding a complete new feature label Nov 9, 2023

JobDoesburg added 2 commits November 12, 2023 22:49

Fix admin

73fe1ce

Fix admin

864f33a

JobDoesburg force-pushed the merchandise-sales-moneybird-integration branch from 58e3dd3 to 864f33a Compare November 12, 2023 21:52

Fix moneybird

2ce0433

Fix bugs

67509f0

JobDoesburg approved these changes Nov 13, 2023

View reviewed changes

DeD1rk requested changes Nov 16, 2023

View reviewed changes

JobDoesburg mentioned this pull request Nov 24, 2023

Merchandise products in sales productlists #1657

Closed

Sync individual items

7b337ed

T8902 closed this Nov 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merchandise sales moneybird integration #3464

Merchandise sales moneybird integration #3464

tmgdejong commented Oct 30, 2023 •

edited by DeD1rk

Loading

DeD1rk commented Oct 30, 2023 •

edited

Loading

tmgdejong commented Oct 30, 2023

JobDoesburg commented Nov 6, 2023

JobDoesburg commented Nov 6, 2023

DeD1rk commented Nov 6, 2023

JobDoesburg commented Nov 7, 2023

tmgdejong commented Nov 7, 2023

DeD1rk commented Nov 7, 2023

JobDoesburg commented Nov 7, 2023

JobDoesburg commented Nov 12, 2023

DeD1rk Nov 16, 2023

DeD1rk Nov 16, 2023

DeD1rk Nov 16, 2023

DeD1rk Nov 16, 2023

JobDoesburg commented Nov 25, 2023

ColonelPhantom commented Oct 9, 2024

T8902 commented Nov 6, 2024

Merchandise sales moneybird integration #3464

Merchandise sales moneybird integration #3464

Conversation

tmgdejong commented Oct 30, 2023 • edited by DeD1rk Loading

DeD1rk commented Oct 30, 2023 • edited Loading

tmgdejong commented Oct 30, 2023

JobDoesburg commented Nov 6, 2023

JobDoesburg commented Nov 6, 2023

DeD1rk commented Nov 6, 2023

JobDoesburg commented Nov 7, 2023

tmgdejong commented Nov 7, 2023

DeD1rk commented Nov 7, 2023

JobDoesburg commented Nov 7, 2023

JobDoesburg commented Nov 12, 2023

DeD1rk Nov 16, 2023

Choose a reason for hiding this comment

DeD1rk Nov 16, 2023

Choose a reason for hiding this comment

DeD1rk Nov 16, 2023

Choose a reason for hiding this comment

DeD1rk Nov 16, 2023

Choose a reason for hiding this comment

JobDoesburg commented Nov 25, 2023

ColonelPhantom commented Oct 9, 2024

T8902 commented Nov 6, 2024

tmgdejong commented Oct 30, 2023 •

edited by DeD1rk

Loading

DeD1rk commented Oct 30, 2023 •

edited

Loading