Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Frederic Thoma
erp5
Commits
f34338a1
Commit
f34338a1
authored
3 years ago
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_printer: possible to return to different view
parent
b5dd91d6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.js
...thTemplateItem/web_page_module/gadget_epson_printer_js.js
+2
-1
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.xml
...hTemplateItem/web_page_module/gadget_epson_printer_js.xml
+2
-2
bt5/erp5_printer/SkinTemplateItem/portal_skins/erp5_printer/SaleOrder_viewEpsonPrintout.zpt
...portal_skins/erp5_printer/SaleOrder_viewEpsonPrintout.zpt
+3
-2
bt5/erp5_printer/SkinTemplateItem/portal_skins/erp5_printer/SaleOrder_viewPrintByEpsonDialog/preview.xml
...erp5_printer/SaleOrder_viewPrintByEpsonDialog/preview.xml
+1
-1
No files found.
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.js
View file @
f34338a1
...
...
@@ -38,6 +38,7 @@
];
gadget
.
state
.
jio_key
=
options
.
jio_key
;
gadget
.
state
.
printer_url
=
options
.
printer_url
;
gadget
.
state
.
redirect_form_id
=
options
.
redirect_form_id
;
return
new
RSVP
.
Queue
()
.
push
(
function
(
hateoas_url
)
{
return
RSVP
.
all
([
...
...
@@ -93,7 +94,7 @@
gadget
=
this
;
return
gadget
.
submitContent
(
gadget
.
state
.
jio_key
,
gadget
.
state
.
hateoas_url
+
gadget
.
state
.
jio_key
+
"
/
"
+
method
,
gadget
.
state
.
hateoas_url
+
gadget
.
state
.
jio_key
+
"
/
"
+
method
+
"
?redirect_form_id=
"
+
gadget
.
state
.
redirect_form_id
,
{})
.
push
(
function
(
result
)
{
return
gadget
.
redirect
({
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_printer/PathTemplateItem/web_page_module/gadget_epson_printer_js.xml
View file @
f34338a1
...
...
@@ -252,7 +252,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
84.44075.1419.10496
</string>
</value>
<value>
<string>
9
90.32371.21747.32204
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -270,7 +270,7 @@
</tuple>
<state>
<tuple>
<float>
1
593420843.63
</float>
<float>
1
614947584.55
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_printer/SkinTemplateItem/portal_skins/erp5_printer/SaleOrder_viewEpsonPrintout.zpt
View file @
f34338a1
...
...
@@ -4,6 +4,7 @@
portal_url here/portal_url;
reservation python: request.get('reservation_only');
form_id python: request.get('form_id');
redirect_form_id python: request.get('redirect_form_id', '');
set_precision python: request.set('precision', here.getQuantityPrecisionFromResource(here.getPriceCurrency()));
quantity_renderer nocall:here/Base_viewTradeFieldLibrary_printer_custom/my_view_mode_quantity/render_pdf;
price_renderer nocall:here/Base_viewTradeFieldLibrary_printer_custom/my_view_mode_total_price/render_pdf;
...
...
@@ -310,14 +311,14 @@
$
(
'
#print_button
'
).
click
();
})
</script>
<a
tal:condition=
"python: not reservation"
href=
"./SaleOrder_confirmAndReturn"
>
<a
tal:condition=
"python: not reservation"
tal:attributes=
"href python:'./SaleOrder_confirmAndReturn?redirect_form_id=%s' % redirect_form_id"
>
<span
i18n:translate=
''
i18n:domain=
'ui'
>
Confirm Order and Return
</span>
</a>
<a
tal:condition=
"reservation"
href=
"./SaleOrderModule_viewReservedItemFastInputDialog"
>
<span
i18n:translate=
''
i18n:domain=
'ui'
>
Return
</span>
</a>
<div
style=
"float:right"
>
<a
tal:attributes=
"href python:'./SaleOrder_cancelAndReturn?reservation=%s
' % reservation
"
>
<a
tal:attributes=
"href python:'./SaleOrder_cancelAndReturn?reservation=%s
&redirect_form_id=%s' % (reservation, redirect_form_id)
"
>
<span
i18n:translate=
''
i18n:domain=
'ui'
>
Cancel Order and Return
</span>
</a>
<br/>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_printer/SkinTemplateItem/portal_skins/erp5_printer/SaleOrder_viewPrintByEpsonDialog/preview.xml
View file @
f34338a1
...
...
@@ -253,7 +253,7 @@
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:{"jio_key": context.getRelativeUrl(), "data_dict": context.Order_getODTDataDict(), "printer_url": context.SaleOrder_getPrinterUrl(), "auto_print": context.REQUEST.get("auto_print", 0)}
</string>
</value>
<value>
<string>
python:{"jio_key": context.getRelativeUrl(), "data_dict": context.Order_getODTDataDict(), "printer_url": context.SaleOrder_getPrinterUrl(), "auto_print": context.REQUEST.get("auto_print", 0)
, "redirect_form_id": context.REQUEST.get("redirect_form_id", "")
}
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
This diff is collapsed.
Click to expand it.
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