Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ivan Tyagov
slapos.core
Commits
4b0d079c
Commit
4b0d079c
authored
Dec 19, 2019
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_payzen: Make alarm compatible with wechat also
Probably this alarm should move into some other bt5 in future.
parent
f2207794
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
18 deletions
+38
-18
master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py
...lapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py
+2
-1
master/bt5/slapos_payzen/TestTemplateItem/portal_components/test.erp5.testSlapOSPayzenBuilder.py
...em/portal_components/test.erp5.testSlapOSPayzenBuilder.py
+36
-17
No files found.
master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py
View file @
4b0d079c
...
@@ -12,7 +12,8 @@ select_kw.pop('delivery_relative_url_list', None)
...
@@ -12,7 +12,8 @@ select_kw.pop('delivery_relative_url_list', None)
select_kw
.
update
(
select_kw
.
update
(
portal_type
=
'Sale Invoice Transaction'
,
portal_type
=
'Sale Invoice Transaction'
,
simulation_state
=
'stopped'
,
simulation_state
=
'stopped'
,
default_payment_mode_uid
=
portal
.
portal_categories
.
payment_mode
.
payzen
.
getUid
(),
default_payment_mode_uid
=
(
portal
.
portal_categories
.
payment_mode
.
payzen
.
getUid
(),
portal
.
portal_categories
.
payment_mode
.
wechat
.
getUid
()),
limit
=
10
,
# do only some in one shot
limit
=
10
,
# do only some in one shot
select_dict
=
select_dict
,
select_dict
=
select_dict
,
left_join_list
=
select_dict
.
keys
(),
left_join_list
=
select_dict
.
keys
(),
...
...
master/bt5/slapos_payzen/TestTemplateItem/portal_components/test.erp5.testSlapOSPayzenBuilder.py
View file @
4b0d079c
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
from
erp5.component.test.SlapOSTestCaseMixin
import
SlapOSTestCaseMixin
from
erp5.component.test.SlapOSTestCaseMixin
import
SlapOSTestCaseMixin
class
TestSlapOSPaymentTransactionOrderBuilder
(
SlapOSTestCaseMixin
):
class
TestSlapOSPaymentTransactionOrderBuilderMixin
(
SlapOSTestCaseMixin
):
def
sumReceivable
(
self
,
payment_transaction
):
def
sumReceivable
(
self
,
payment_transaction
):
quantity
=
.
0
quantity
=
.
0
default_source_uid
=
self
.
portal
.
restrictedTraverse
(
default_source_uid
=
self
.
portal
.
restrictedTraverse
(
...
@@ -32,7 +33,7 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -32,7 +33,7 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
'price_currency/%s'
%
invoice
.
getPriceCurrency
(),
'price_currency/%s'
%
invoice
.
getPriceCurrency
(),
'resource/%s'
%
invoice
.
getResource
(),
'resource/%s'
%
invoice
.
getResource
(),
'source_payment/organisation_module/slapos/bank_account'
,
'source_payment/organisation_module/slapos/bank_account'
,
'payment_mode/
payzen'
,
'payment_mode/
%s'
%
self
.
payment_mode
,
'source_section/%s'
%
invoice
.
getSourceSection
(),
'source_section/%s'
%
invoice
.
getSourceSection
(),
]
]
self
.
assertSameSet
(
expected_set
,
payment
.
getCategoryList
())
self
.
assertSameSet
(
expected_set
,
payment
.
getCategoryList
())
...
@@ -76,12 +77,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -76,12 +77,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
return
self
.
portal
.
portal_orders
.
slapos_payment_transaction_builder
.
build
(
return
self
.
portal
.
portal_orders
.
slapos_payment_transaction_builder
.
build
(
**
kw
)
**
kw
)
def
test
(
self
):
def
_
test
(
self
):
person
=
self
.
portal
.
person_module
.
template_member
\
person
=
self
.
portal
.
person_module
.
template_member
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
invoice
.
confirm
()
invoice
.
confirm
()
invoice
.
stop
()
invoice
.
stop
()
self
.
tic
()
self
.
tic
()
...
@@ -93,12 +95,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -93,12 +95,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
payment
=
payment_list
[
0
].
getObject
()
payment
=
payment_list
[
0
].
getObject
()
self
.
assertPayment
(
payment
,
invoice
)
self
.
assertPayment
(
payment
,
invoice
)
def
test_twice
(
self
):
def
_
test_twice
(
self
):
person
=
self
.
portal
.
person_module
.
template_member
\
person
=
self
.
portal
.
person_module
.
template_member
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
invoice
.
confirm
()
invoice
.
confirm
()
invoice
.
stop
()
invoice
.
stop
()
self
.
tic
()
self
.
tic
()
...
@@ -111,12 +114,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -111,12 +114,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
payment
=
payment_list
[
0
].
getObject
()
payment
=
payment_list
[
0
].
getObject
()
self
.
assertPayment
(
payment
,
invoice
)
self
.
assertPayment
(
payment
,
invoice
)
def
test_twice_transaction
(
self
):
def
_
test_twice_transaction
(
self
):
person
=
self
.
portal
.
person_module
.
template_member
\
person
=
self
.
portal
.
person_module
.
template_member
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
invoice
.
confirm
()
invoice
.
confirm
()
invoice
.
stop
()
invoice
.
stop
()
self
.
tic
()
self
.
tic
()
...
@@ -129,12 +133,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -129,12 +133,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
payment
=
payment_list
[
0
].
getObject
()
payment
=
payment_list
[
0
].
getObject
()
self
.
assertPayment
(
payment
,
invoice
)
self
.
assertPayment
(
payment
,
invoice
)
def
test_twice_indexation
(
self
):
def
_
test_twice_indexation
(
self
):
person
=
self
.
portal
.
person_module
.
template_member
\
person
=
self
.
portal
.
person_module
.
template_member
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
invoice
.
confirm
()
invoice
.
confirm
()
invoice
.
stop
()
invoice
.
stop
()
self
.
tic
()
self
.
tic
()
...
@@ -150,12 +155,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -150,12 +155,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
payment
=
payment_list
[
0
].
getObject
()
payment
=
payment_list
[
0
].
getObject
()
self
.
assertPayment
(
payment
,
invoice
)
self
.
assertPayment
(
payment
,
invoice
)
def
test_cancelled_payment
(
self
):
def
_
test_cancelled_payment
(
self
):
person
=
self
.
portal
.
person_module
.
template_member
\
person
=
self
.
portal
.
person_module
.
template_member
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
invoice
.
confirm
()
invoice
.
confirm
()
invoice
.
stop
()
invoice
.
stop
()
self
.
tic
()
self
.
tic
()
...
@@ -173,17 +179,19 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -173,17 +179,19 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
payment
=
payment_list
[
0
].
getObject
()
payment
=
payment_list
[
0
].
getObject
()
self
.
assertPayment
(
payment
,
invoice
)
self
.
assertPayment
(
payment
,
invoice
)
def
test_two_invoices
(
self
):
def
_
test_two_invoices
(
self
):
person
=
self
.
portal
.
person_module
.
template_member
\
person
=
self
.
portal
.
person_module
.
template_member
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice_1
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice_1
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice_1
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice_1
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
invoice_1
.
confirm
()
invoice_1
.
confirm
()
invoice_1
.
stop
()
invoice_1
.
stop
()
invoice_2
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice_2
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice_2
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice_2
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
invoice_2
.
confirm
()
invoice_2
.
confirm
()
invoice_2
.
stop
()
invoice_2
.
stop
()
self
.
tic
()
self
.
tic
()
...
@@ -203,12 +211,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -203,12 +211,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
self
.
assertPayment
(
payment_1
,
invoice_1
)
self
.
assertPayment
(
payment_1
,
invoice_1
)
self
.
assertPayment
(
payment_2
,
invoice_2
)
self
.
assertPayment
(
payment_2
,
invoice_2
)
def
test_two_lines
(
self
):
def
_
test_two_lines
(
self
):
person
=
self
.
portal
.
person_module
.
template_member
\
person
=
self
.
portal
.
person_module
.
template_member
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
invoice
=
self
.
portal
.
accounting_module
.
template_sale_invoice_transaction
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
())
invoice
.
edit
(
destination_section
=
person
.
getRelativeUrl
(),
payment_mode
=
self
.
payment_mode
)
self
.
tic
()
self
.
tic
()
default_source_uid
=
self
.
portal
.
restrictedTraverse
(
default_source_uid
=
self
.
portal
.
restrictedTraverse
(
'account_module/receivable'
).
getUid
()
'account_module/receivable'
).
getUid
()
...
@@ -235,3 +244,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
...
@@ -235,3 +244,13 @@ class TestSlapOSPaymentTransactionOrderBuilder(SlapOSTestCaseMixin):
payment
=
payment_list
[
0
].
getObject
()
payment
=
payment_list
[
0
].
getObject
()
self
.
assertPayment
(
payment
,
invoice
)
self
.
assertPayment
(
payment
,
invoice
)
class
TestSlapOSPaymentTransactionOrderBuilder
(
TestSlapOSPaymentTransactionOrderBuilderMixin
):
payment_mode
=
"payzen"
test
=
TestSlapOSPaymentTransactionOrderBuilderMixin
.
_test
test_twice
=
TestSlapOSPaymentTransactionOrderBuilderMixin
.
_test_twice
test_twice_transaction
=
TestSlapOSPaymentTransactionOrderBuilderMixin
.
_test_twice_transaction
test_twice_indexation
=
TestSlapOSPaymentTransactionOrderBuilderMixin
.
_test_twice_indexation
test_cancelled_payment
=
TestSlapOSPaymentTransactionOrderBuilderMixin
.
_test_cancelled_payment
test_two_invoices
=
TestSlapOSPaymentTransactionOrderBuilderMixin
.
_test_two_invoices
test_two_lines
=
TestSlapOSPaymentTransactionOrderBuilderMixin
.
_test_two_lines
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment