Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.0] [ADD] Website sale subscription form #334

Closed
wants to merge 143 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
d3ddd79
[ADD] pos_customer_wallet
carmenbianca Apr 7, 2022
35077ff
[ADD] pos_customer_wallet: Display wallet balance on POS payment screen
carmenbianca Apr 7, 2022
4139829
[ADD] pos_customer_wallet: Make global module toggle available in pos…
carmenbianca Apr 8, 2022
5321b00
[ADD] pos_customer_wallet: Journal demo data
carmenbianca Apr 11, 2022
8af348e
[ADD] pos_customer_wallet: Mandate selected customer when using walle…
carmenbianca Apr 13, 2022
c4cc880
[ADD] pos_customer_wallet: Check sufficient balance before POS purchase
carmenbianca Apr 13, 2022
4c65655
[FIX] account_customer_wallet: Write account_wallet to res.company in…
carmenbianca Apr 19, 2022
f0c496c
[ADD] pos_customer_wallet: Recompute balance based on POS statement l…
carmenbianca Apr 20, 2022
843035c
[ADD] pos_account_wallet: Update wallet balance in POS
carmenbianca Apr 21, 2022
9441262
[FIX] pos_customer_wallet: Update write_date on computation of wallet…
carmenbianca Apr 21, 2022
5acebf8
[REM] account_customer_wallet: Remove some fields and api.depends lines
carmenbianca Apr 22, 2022
45868c3
[ADD] pos_customer_wallet: Tests
carmenbianca Apr 22, 2022
789a5fa
[REF] pos_customer_wallet: Re-implement wallet computation using part…
carmenbianca Apr 22, 2022
2a5aabb
[REM] account_customer_wallet: Custom wallet toggle; depend on whethe…
carmenbianca Apr 22, 2022
32556c1
[FIX] account_customer_wallet: Search balance on all partners in fami…
carmenbianca Apr 28, 2022
d9123bf
[FIX] pos_customer_wallet: Avoid null error when no customer is selected
carmenbianca May 5, 2022
ce833b0
[ADD] account_customer_wallet: README.rst
carmenbianca May 6, 2022
63f8257
[UPD] Update pos_customer_wallet.pot
May 6, 2022
87582ba
[FIX] pos_customer_wallet: Partner form should not break for users wi…
carmenbianca Jun 15, 2022
748bc6a
pos_customer_wallet 12.0.1.0.1
github-grap-bot Jun 23, 2022
158bbe9
[FIX] SCRLfs → SC
carmenbianca Jun 29, 2022
c87c8db
[ADD] pos_customer_wallet: Show balance on ticket
remytms May 25, 2022
a0e7e0e
[FIX] pos_customer_wallet: typo
remytms May 25, 2022
c381b9c
[REF] *_customer_wallet: Create partner.get_all_partners_in_family
carmenbianca Jun 15, 2022
41e8a5d
[ADD] pos_customer_wallet_is_user
carmenbianca Jun 15, 2022
c636e3e
[ADD] *_customer_wallet: Change log entries
carmenbianca Jun 16, 2022
bf1635d
[UPD] Update pos_customer_wallet.pot
Jul 8, 2022
b207794
[UPD] changelog
github-grap-bot Jul 8, 2022
6d49cc5
[UPD] README.rst
github-grap-bot Jul 8, 2022
6064ade
pos_customer_wallet 12.0.1.1.0
github-grap-bot Jul 8, 2022
ace1e43
[FIX] SCRL fs → SC
carmenbianca Jul 11, 2022
7288dbe
[FIX] pos_customer_wallet : makes the modules working in an non proxy…
legalsylvain Aug 9, 2022
274c4d3
[REF] move overload function at the beginning of the javascript file,…
legalsylvain Aug 9, 2022
dd5e7c8
[FIX] force user to select a customer if wallet payment are selected,…
legalsylvain Aug 9, 2022
1cfa728
[ADD] implement wallet credit with product in the Point of Sale front…
legalsylvain Aug 9, 2022
26c78ab
[IMP] pos_customer_wallet : do not display wallet balance on ticket i…
legalsylvain Aug 9, 2022
a22401d
[IMP] pos_customer_wallet : display wallet balance on client detail s…
legalsylvain Aug 9, 2022
e219d44
[REF] pos_customer_wallet : refactor code and create a sub function t…
legalsylvain Aug 9, 2022
472a058
[IMP] pos_customer_wallet : update partner wallet balance with pendin…
legalsylvain Aug 9, 2022
dbabc59
[REF] Add GRAP as coauthor of the wallet modules
legalsylvain Aug 9, 2022
b6a1da0
[i18n] update pot files and add fr translations
legalsylvain Sep 5, 2022
879d8a8
[IMP] pos_customer_wallet : return early if no partners
legalsylvain Sep 9, 2022
3b8e5d4
[TR] update fr translation
legalsylvain Sep 12, 2022
6c11739
[FIX] pos_customer_wallet: Use where_calc method in pos_order_line co…
carmenbianca Sep 15, 2022
1c5aeda
[FIX] do not displayed 'undefined' where creating a new customer via UI
legalsylvain Sep 26, 2022
0620591
[PERF] refactor get_wallet_balance_pos_order_line(). 6 requests for 1…
legalsylvain Feb 28, 2023
00999c8
[REF] refactor _compute_customer_wallet_balance overload. Do not dupl…
legalsylvain Feb 28, 2023
9204d6f
[IMP] pos_customer_wallet : simplify PoS template
legalsylvain Feb 28, 2023
6506168
[IMP] pos_customer_wallet : display futur balance, if the order is co…
legalsylvain Feb 28, 2023
62f309a
[IMP] pos_customer_wallet : add possibility to have wallet negative
legalsylvain Feb 28, 2023
df0ae67
[translation] *_customer_wallet : update translation
legalsylvain Feb 28, 2023
2539dcc
[REF] Move minimum_wallet_amount field from pos.config to account.jou…
legalsylvain Mar 21, 2023
fa2c5a5
[REF] pos_customer_wallet : create a function is_balance_above_minimu…
legalsylvain Mar 21, 2023
7c2419f
[FIX] allow user to access to the wallet amount even if they are not …
legalsylvain Mar 21, 2023
a30d349
[UPD] Update pos_customer_wallet.pot
Mar 25, 2023
3239ddf
[UPD] README.rst
github-grap-bot Mar 25, 2023
bdd8f22
[FIX] pos_customer_wallet[_partner_is_user]: Pass required argument
carmenbianca Jun 26, 2023
eae089d
pos_customer_wallet 12.0.2.1.0
github-grap-bot Jun 29, 2023
25d2789
[FIX] pos_customer_wallet[_*]: Rename foodprint class
carmenbianca Sep 9, 2022
9dca606
[FIX] pos_customer_wallet_[*]: Repair maintainer tags in manifest
carmenbianca Jun 30, 2023
e50987e
[UPD] Run prettier
carmenbianca Jun 30, 2023
12dd399
[UPD] README.rst
github-grap-bot Jun 30, 2023
56fc15f
pos_customer_wallet 12.0.2.1.1
github-grap-bot Jun 30, 2023
44512a9
[UPD] Update pos_customer_wallet.pot
Jun 30, 2023
d804990
[IMP] pos_customer_wallet: black, isort, prettier
carmenbianca Jul 5, 2023
5b97d84
[ADD] pos_customer_wallet_is_user
carmenbianca Jun 15, 2022
667eda7
[REM] pos_customer_wallet_partner_is_user: Don't compute the field
carmenbianca Jun 16, 2022
54e0aaa
[IMP] SCRLfs → SC
carmenbianca Jul 8, 2022
176224e
[UPD] Update pos_customer_wallet_partner_is_user.pot
Jul 8, 2022
3a16dde
[UPD] README.rst
github-grap-bot Jul 8, 2022
04990fd
pos_customer_wallet_partner_is_user 12.0.1.1.0
github-grap-bot Jul 8, 2022
908f151
[FIX] pos_customer_wallet_partner_is_user: Raise error when functiona…
carmenbianca Jun 19, 2023
16a6ccf
[IMP] pos_customer_wallet_partner_is_user: Add to roadmap
carmenbianca Jun 20, 2023
8094f1a
[FIX] pos_customer_wallet_partner_is_user: Use more robust method to …
carmenbianca Jun 26, 2023
011f530
[FIX] pos_customer_wallet[_partner_is_user]: Pass required argument
carmenbianca Jun 26, 2023
4fe15d3
[IMP] pos_customer_wallet_partner_is_user: Clarifying comment
carmenbianca Jun 29, 2023
78387c8
[UPD] Update pos_customer_wallet_partner_is_user.pot
Jun 29, 2023
7bee5f9
[UPD] README.rst
github-grap-bot Jun 29, 2023
70adb39
pos_customer_wallet_partner_is_user 12.0.1.2.0
github-grap-bot Jun 29, 2023
f0a06e3
[FIX] pos_customer_wallet[_*]: Rename foodprint class
carmenbianca Sep 9, 2022
1cbaf56
[FIX] pos_customer_wallet_[*]: Repair maintainer tags in manifest
carmenbianca Jun 30, 2023
0efb6a8
[UPD] Run prettier
carmenbianca Jun 30, 2023
30b8c3e
[UPD] README.rst
github-grap-bot Jun 30, 2023
f47fb38
pos_customer_wallet_partner_is_user 12.0.1.2.1
github-grap-bot Jun 30, 2023
ce6c633
[UPD] Update pos_customer_wallet_partner_is_user.pot
Jun 30, 2023
0d9a322
[IMP] pos_customer_wallet_partner_is_user: black, isort, prettier
carmenbianca Sep 18, 2023
b4517dd
[MIG] pos_customer_wallet_partner_is_user: Migration to 13.0
carmenbianca Sep 18, 2023
a471deb
[MIG] pos_customer_wallet_partner_is_user: Migration to 14.0
carmenbianca Sep 18, 2023
f4e22e2
[MIG] pos_customer_wallet_partner_is_user: Migration to 15.0
carmenbianca Sep 18, 2023
5b22f64
[MIG] pos_customer_wallet_partner_is_user: Migration to 16.0
carmenbianca Sep 18, 2023
9b3ed72
[IMP] pos_customer_wallet_partner_is_user: Hide payment method condit…
carmenbianca Jan 22, 2024
1818433
[MIG] pos_customer_wallet: Migration to 13.0
carmenbianca Jul 5, 2023
cdcac46
[MIG] pos_customer_wallet: Migration to 14.0
carmenbianca Jul 5, 2023
64249a0
[MIG] pos_customer_wallet: Migration to 15.0
carmenbianca Jul 6, 2023
e0e8249
[MIG] pos_customer_wallet: Migration to 16.0
carmenbianca Jul 6, 2023
1f0ba93
[REF] pos_customer_wallet: Use ORM instead of SQL queries
carmenbianca Sep 4, 2023
7d1cf54
[REM] pos_customer_wallet: Remove bank statement line method of walle…
carmenbianca Sep 8, 2023
b4c8c4c
[FIX] pos_customer_wallet: Add some copyright headers
carmenbianca Sep 8, 2023
3196438
[IMP] pos_customer_wallet: Some user-facing documentation
carmenbianca Sep 21, 2023
c670d0f
[IMP] pos_customer_wallet: Slightly refactor tests to use the same se…
carmenbianca May 17, 2024
0f8eeef
[IMP] pos_customer_wallet: After closing, correctly handle purchased …
carmenbianca May 17, 2024
dcf77e8
[REF] pos_customer_wallet: Refactor to .esm.js
carmenbianca May 27, 2024
c98c3ac
[ADD] event_track_speaker_book
victor-champonnois Aug 9, 2024
356c28a
[FIX] compute method
victor-champonnois Aug 9, 2024
4971b6c
[IMP] clickable link on speaker form
victor-champonnois Sep 4, 2024
a3c43ae
[IMP] fix status and add to list view
victor-champonnois Sep 4, 2024
1261ae8
[FIX] compute method
victor-champonnois Sep 4, 2024
cf56fc8
[ADD] event_speaker_travel
victor-champonnois Sep 9, 2024
78c53c1
[FIX] set book manually with constraint
victor-champonnois Sep 11, 2024
3253ea9
[ADD] event_track_speaker_catering
victor-champonnois Sep 11, 2024
d481869
[ADD] event_track_multi_date
victor-champonnois Sep 12, 2024
7ae1329
fixup
victor-champonnois Sep 12, 2024
96f0f0d
fixup
victor-champonnois Sep 13, 2024
8c4d261
[FIX] e_t_speaker_book: fix typo and improve ui
remytms Sep 17, 2024
18d0ab0
[IMP] e_t_speaker_book: improve security
remytms Sep 17, 2024
742e3ff
[IMP] e_t_speaker_book: manifest category
remytms Sep 17, 2024
a2efbcc
[IMP] e_t_speaker_catering: remove default add constrains
remytms Sep 17, 2024
fc4916d
[FIX] e_t_speaker_catering: copyright and manifest category
remytms Sep 17, 2024
5a31671
[FIX] e_t_speaker_book: fix wrong copyright
remytms Sep 18, 2024
8605cbf
[CHG] e_s_travel: rename to e_t_speaker_travel
remytms Sep 18, 2024
7ac94b4
[FIX] e_t_s_travel: travel_expense compute cost
remytms Sep 18, 2024
cfed6f7
[IMP] e_t_s_travel: improve ui
remytms Sep 18, 2024
07c97c8
[IMP] e_t_s_travel: add tickets on booking
remytms Sep 18, 2024
bff75c3
[IMP] e_t_s_travel: security
remytms Sep 18, 2024
5b66b1b
[ADD] e_t_s_book: book providers
remytms Sep 18, 2024
1741a65
[ADD] e_t_s_catering: meal quantity (and pre-commit fixes)
remytms Sep 18, 2024
924d029
[FIX] e_t_multi_date: wrong copyright and imp security
remytms Sep 18, 2024
6add12a
[ADD] e_t_multi_date: split date and time
remytms Sep 18, 2024
ae627b1
[ADD] e_t_multi_date: default date
remytms Sep 18, 2024
bcedd1a
[ADD] e_t_multi_date: date contrains
remytms Sep 19, 2024
d7075f1
[ADD] et_speaker_catering: default value for date
remytms Sep 19, 2024
3a62f2f
[FIX] e_t_s_travel: has_travel
remytms Sep 19, 2024
e8a4c7f
[FIX] e_t_speaker_travel: fix menu
remytms Oct 7, 2024
c9c31db
[FIX] e_t_speaker_catering: menu and access rights
remytms Oct 7, 2024
8bc7054
[FIX] e_t_speaker: fix menu
remytms Oct 7, 2024
3416b66
Merge commit 'refs/pull/300/head' of github.com:coopiteasy/addons int…
remytms Oct 21, 2024
25f772a
Merge commit 'refs/pull/307/head' of github.com:coopiteasy/addons int…
remytms Oct 21, 2024
9d57de7
Merge commit 'refs/pull/322/head' of github.com:coopiteasy/addons int…
remytms Oct 21, 2024
2c36feb
Merge commit 'refs/pull/326/head' of github.com:coopiteasy/addons int…
remytms Oct 21, 2024
6aac4d7
Merge commit 'refs/pull/325/head' of github.com:coopiteasy/addons int…
remytms Oct 21, 2024
63355f1
Merge commit 'refs/pull/327/head' of github.com:coopiteasy/addons int…
remytms Oct 21, 2024
3ec360b
[GEN] generate readme
remytms Nov 19, 2024
aeda8a9
[ADD] website_sale_subscription_form
remytms Nov 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ADD] pos_customer_wallet: Make global module toggle available in pos…
….config

Signed-off-by: Carmen Bianca Bakker <[email protected]>
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
carmenbianca committed Sep 7, 2023
commit 41398296bc1c86364088f6bd20ae266cf0ec05cd
1 change: 1 addition & 0 deletions pos_customer_wallet/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
1 change: 1 addition & 0 deletions pos_customer_wallet/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import pos_config
20 changes: 20 additions & 0 deletions pos_customer_wallet/models/pos_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2022 Coop IT Easy SCRL fs
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

from odoo import fields, models


class PosConfig(models.Model):
_inherit = "pos.config"

is_enabled_customer_wallet = fields.Boolean(
string="Is Customer Wallet Enabled",
compute="_compute_is_enabled_customer_wallet",
)

def _compute_is_enabled_customer_wallet(self):
result = self.env["ir.config_parameter"].get_param(
"account_customer_wallet.customer_wallet"
)
for pos_config in self:
pos_config.is_enabled_customer_wallet = result
14 changes: 9 additions & 5 deletions pos_customer_wallet/static/src/js/screens.js
Original file line number Diff line number Diff line change
@@ -8,11 +8,15 @@ odoo.define("pos_customer_wallet.screens", function (require) {
screens.PaymentScreenWidget.include({
customer_changed: function () {
this._super();
var client = this.pos.get_client();
this.$(".balance").text(
client ? this.format_currency(client.customer_wallet_balance) : ""
);
this.$(".balance-header").text(client ? _t("Customer Wallet Balance") : "");
if (this.pos.config.is_enabled_customer_wallet) {
var client = this.pos.get_client();
this.$(".balance").text(
client ? this.format_currency(client.customer_wallet_balance) : ""
);
this.$(".balance-header").text(
client ? _t("Customer Wallet Balance") : ""
);
}
},
});
});
13 changes: 8 additions & 5 deletions pos_customer_wallet/static/src/xml/pos.xml
Original file line number Diff line number Diff line change
@@ -3,8 +3,11 @@
<t t-extend="PaymentScreenWidget">
<t t-jquery=".payment-buttons" t-operation="after">
<div class="balance-container">
<!-- TODO: For some reason this if-statement is always false. -->
<!-- <t t-if="widget.pos.config.customer_wallet"> -->
<!--
TODO: The div and h3 will be undefined if this is false.
What happens if the toggle is later enabled?
-->
<t t-if="widget.pos.config.is_enabled_customer_wallet">
<h3 class="balance-header">
<t t-if="widget.pos.get_client()">
Customer Wallet Balance
@@ -13,11 +16,11 @@
<div class='balance'>
<t t-if="widget.pos.get_client()">
<t
t-esc="widget.format_currency(widget.pos.get_client().customer_wallet_balance)"
/>
t-esc="widget.format_currency(widget.pos.get_client().customer_wallet_balance)"
/>
</t>
</div>
<!-- </t> -->
</t>
</div>
</t>
</t>