'
- + __("Loading") + '...
');
+ $(this.dialog.body).html(
+ `
+ ${__("Loading")}...
+
`);
this.dialog.show();
- },
- make_dialog: function() {
+ }
+
+ make_dialog() {
var me = this;
this.dialog = new frappe.ui.Dialog({
hide_on_page_refresh: true,
- title: __("Linked With"),
- fields: [
- { fieldtype: "HTML", label: "list" }
- ]
+ title: __("Linked With")
});
- this.dialog.$wrapper.find(".modal-dialog").addClass("linked-with-dialog");
-
- this.dialog.on_page_show = function() {
+ this.dialog.on_page_show = () => {
// execute ajax calls sequentially
// 1. get linked doctypes
// 2. load all doctypes
// 3. load linked docs
- $.when(me.get_linked_doctypes())
- .then(function() { return me.load_doctypes() })
- .then(function() {
- if (me.links_not_permitted_or_missing()) {
- return;
- }
-
- return me.get_linked_docs();
- });
+ this.get_linked_doctypes()
+ .then(() => this.load_doctypes())
+ .then(() => this.links_not_permitted_or_missing())
+ .then(() => this.get_linked_docs())
+ .then(() => this.make_html())
}
+ }
- },
+ make_html() {
+ const linked_docs = this.frm.__linked_docs;
- load_doctypes: function() {
- var me = this;
- var already_loaded = Object.keys(locals.DocType);
- var doctypes_to_load = [];
- if (me.frm.__linked_doctypes) {
- $.each(Object.keys(me.frm.__linked_doctypes), function(i, v) {
- if (already_loaded.indexOf(v)===-1) {
- doctypes_to_load.push(v);
- }
+ let html;
+
+ if(Object.keys(linked_docs).length === 0) {
+ html = __("Not Linked to any record");
+ } else {
+ html = Object.keys(linked_docs).map(dt => {
+ return `
+ ${this.make_doc_head(dt)}
+ ${linked_docs[dt]
+ .map(doc => this.make_doc_row(doc, dt))
+ .join("")}
+
`;
});
}
- // load all doctypes sequentially using with_doctype
- return $.when.apply($, $.map(doctypes_to_load, function(dt) {
- return frappe.model.with_doctype(dt, function() {
- if (frappe.listview_settings[dt]) {
- // add additional fields to __linked_doctypes
- me.frm.__linked_doctypes[dt].add_fields = frappe.listview_settings[dt].add_fields;
- }
- }, /*async*/ false);
- }));
- },
- links_not_permitted_or_missing: function() {
- var me = this;
- var links = [];
- $.each(me.frm.__linked_doctypes, function(doctype, tmp) {
- if(frappe.model.can_get_report(doctype)) {
- links.push({label: __(doctype), value: doctype});
- }
- });
+ $(this.dialog.body).html(html);
+ }
- links = frappe.utils.sort(links, "label");
+ load_doctypes() {
+ const already_loaded = Object.keys(locals.DocType);
+ let doctypes_to_load = [];
- if(!links) {
- me.dialog.fields_dict.list.$wrapper.html(""
- + me.frm.doctype + ": "
- + (me.frm.__linked_doctypes ? __("Not Linked to any record.") : __("Not enough permission to see links."))
- + "
")
- return true;
- }
-
- return false;
- },
-
- get_linked_doctypes: function() {
- var me = this;
if (this.frm.__linked_doctypes) {
- return;
+ doctypes_to_load =
+ Object.keys(this.frm.__linked_doctypes)
+ .filter(doctype => !already_loaded.includes(doctype));
}
- return frappe.call({
- method: "frappe.desk.form.linked_with.get_linked_doctypes",
- args: {
- doctype: this.frm.doctype
- },
- callback: function(r) {
- me.frm.__linked_doctypes = r.message;
- }
- });
- },
-
- get_linked_docs: function() {
- var me = this;
- return frappe.call({
- method:"frappe.desk.form.linked_with.get_linked_docs",
- args: {
- doctype: me.frm.doctype,
- name: me.frm.docname,
- linkinfo: me.frm.__linked_doctypes,
- for_doctype: me.for_doctype
- },
- callback: function(r) {
- var parent = me.dialog.fields_dict.list.$wrapper.empty();
-
- if(keys(r.message || {}).length) {
- $.each(keys(r.message).sort(), function(i, doctype) {
-
- if (Object.keys(locals.DocType).indexOf(doctype)=== -1) {
- frappe.model.with_doctype(doctype, function() {
- if (frappe.listview_settings[doctype]) {
- // add additional fields to __linked_doctypes
- me.frm.__linked_doctypes[doctype] = {}
- me.frm.__linked_doctypes[doctype].add_fields = frappe.listview_settings[doctype].add_fields;
- }
- }, /*async*/ false);
- }
-
- var listview = frappe.views.get_listview(doctype, me);
- listview.no_delete = true;
- me.current_view = "List"
-
- var wrapper = $('').appendTo(parent);
- $('
').html(__(doctype).bold()).appendTo(wrapper);
- var body = $('
').appendTo(wrapper);
-
- $.each(r.message[doctype], function(i, d) {
- d.doctype = doctype;
- listview.render($('')
- .appendTo(body), d, me);
- })
- })
- } else {
- parent.html(__("Not Linked to any record."));
+ // load all doctypes asynchronously using with_doctype
+ const promises = doctypes_to_load.map(dt => {
+ return frappe.model.with_doctype(dt, () => {
+ if(frappe.listview_settings[dt]) {
+ // add additional fields to __linked_doctypes
+ this.frm.__linked_doctypes[dt].add_fields =
+ frappe.listview_settings[dt].add_fields;
}
+ });
+ });
+
+ return Promise.all(promises);
+ }
+
+ links_not_permitted_or_missing() {
+ var me = this;
+ let links = null;
+
+ links =
+ Object.keys(this.frm.__linked_doctypes)
+ .filter(frappe.model.can_get_report);
+
+ let flag;
+ if(!links) {
+ $(this.dialog.body).html(
+ `${this.frm.__linked_doctypes
+ ? __("Not enough permission to see links")
+ : __("Not Linked to any record")}`);
+ flag = true;
+ }
+ flag = false;
+
+ // reject Promise if not_permitted or missing
+ return new Promise(
+ (resolve, reject) => flag ? reject() : resolve()
+ );
+ }
+
+ get_linked_doctypes() {
+ return new Promise((resolve, reject) => {
+ if (this.frm.__linked_doctypes) {
+ resolve();
+ }
+
+ frappe.call({
+ method: "frappe.desk.form.linked_with.get_linked_doctypes",
+ args: {
+ doctype: this.frm.doctype
+ },
+ callback: (r) => {
+ this.frm.__linked_doctypes = r.message;
+ resolve();
+ }
+ });
+ });
+ }
+
+ get_linked_docs() {
+ return frappe.call({
+ method: "frappe.desk.form.linked_with.get_linked_docs",
+ args: {
+ doctype: this.frm.doctype,
+ name: this.frm.docname,
+ linkinfo: this.frm.__linked_doctypes,
+ for_doctype: this.for_doctype
+ },
+ callback: (r) => {
+ this.frm.__linked_docs = r.message || {};
}
});
}
-});
+
+ make_doc_head(heading) {
+ return ` 0 && (isNaN((new Date(val)).valueOf()))) {
+ val = " ".repeat(d['indent'] * 8) + val;
+ }
+ // remove single quotes at start and end of total labels when export to csv
+ if(val.charAt(0) == "'" && val.charAt(val.length -1) == "'") {
+ val = val.substr(1, val.length-2);
+ }
+ }
row.push(val);
});
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 41a2aef40b..e6ed3ccc18 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -67,15 +67,22 @@ frappe.request.call = function(opts) {
opts.success_callback && opts.success_callback(data, xhr.responseText);
},
401: function(xhr) {
- msgprint({message:__("You have been logged out"), indicator: 'red'});
- frappe.app.logout();
+ if(frappe.app.session_expired_dialog && frappe.app.session_expired_dialog.display) {
+ frappe.app.redirect_to_login();
+ } else {
+ frappe.app.handle_session_expired();
+ };
},
404: function(xhr) {
msgprint({title:__("Not found"), indicator:'red',
message: __('The resource you are looking for is not available')});
},
403: function(xhr) {
- if (xhr.responseJSON && xhr.responseJSON._server_messages) {
+ if (frappe.get_cookie('sid')==='Guest') {
+ // session expired
+ frappe.app.handle_session_expired();
+ }
+ else if (xhr.responseJSON && xhr.responseJSON._server_messages) {
var _server_messages = JSON.parse(xhr.responseJSON._server_messages);
// avoid double messages
@@ -83,10 +90,13 @@ frappe.request.call = function(opts) {
return;
}
}
+ else {
+ frappe.msgprint({
+ title:__("Not permitted"), indicator:'red',
+ message: __('You do not have enough permissions to access this resource. Please contact your manager to get access.')});
+ }
+
- frappe.utils.play_sound("error");
- msgprint({title:__("Not permitted"), indicator:'red',
- message: __('You do not have enough permissions to access this resource. Please contact your manager to get access.')});
},
508: function(xhr) {
frappe.utils.play_sound("error");
@@ -233,11 +243,7 @@ frappe.request.cleanup = function(opts, r) {
// session expired? - Guest has no business here!
if(r.session_expired || frappe.get_cookie("sid")==="Guest") {
- if(!frappe.app.logged_out) {
- localStorage.setItem("session_last_route", location.hash);
- msgprint(__('Session Expired. Logging you out'));
- frappe.app.logout();
- }
+ frappe.app.handle_session_expired();
return;
}
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index 18ef247519..8ab1019a54 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -47,7 +47,8 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({
cur_dialog = null;
}
}
- me.onhide && me.onhide.apply(me);
+ me.onhide && me.onhide();
+ me.on_hide && me.on_hide();
})
.on("shown.bs.modal", function() {
// focus on first input
diff --git a/frappe/public/js/frappe/ui/upload.html b/frappe/public/js/frappe/ui/upload.html
index 23b4a8b4de..08977e0be0 100644
--- a/frappe/public/js/frappe/ui/upload.html
+++ b/frappe/public/js/frappe/ui/upload.html
@@ -1,9 +1,9 @@
+
`;
+ }
+
+ make_doc_row(doc, doctype) {
+ return `
+ ${heading}
+
+
`;
+ }
+}
diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js
index 5e9399cab0..bbdc86b120 100644
--- a/frappe/public/js/frappe/list/list_renderer.js
+++ b/frappe/public/js/frappe/list/list_renderer.js
@@ -503,6 +503,8 @@ frappe.views.ListRenderer = Class.extend({
this.render_view = function (values) {
// prepare data before rendering view
values = values.map(me.prepare_data.bind(this));
+ // remove duplicates
+ values = values.uniqBy(value => value.name);
if (lib_exists) {
me.load_lib(function () {
diff --git a/frappe/public/js/frappe/misc/tools.js b/frappe/public/js/frappe/misc/tools.js
index 622d0da507..1414a5eee6 100644
--- a/frappe/public/js/frappe/misc/tools.js
+++ b/frappe/public/js/frappe/misc/tools.js
@@ -77,6 +77,14 @@ frappe.slickgrid_tools = {
get_filtered_items: function(dataView) {
var data = [];
for (var i=0, len=dataView.getLength(); i
+
+
+ ${doc.name}
+
+
-
+
-
+
{%= __("or") %}
e.minFatFingerCompensation?-3*e.lineWidth:e.minFatFingerCompensation;b(l);d.ontouchend=a;d.ontouchstart=b;d.ontouchmove=c},d.onmousedown=function(e){d.ontouchstart=d.ontouchend=d.ontouchmove=void 0;b(e);d.onmousedown=b;d.onmouseup=a;d.onmousemove=c},window.navigator.msPointerEnabled&&
+(d.onmspointerdown=b,d.onmspointerup=a,d.onmspointermove=c))}).call(this,d.drawEndHandler,d.drawStartHandler,d.drawMoveHandler);c[f+".windowmouseup"]=l.subscribe(f+".windowmouseup",d.drawEndHandler);this.events.publish(f+".attachingEventHandlers");s.call(this,this,e.width.toString(10),f,l);this.resetCanvas(e.data);this.events.publish(f+".initialized");return this}function w(c){if(c.getContext)return!1;var a=c.ownerDocument.parentWindow,b=a.FlashCanvas?c.ownerDocument.parentWindow.FlashCanvas:"undefined"===
+typeof FlashCanvas?void 0:FlashCanvas;if(b){c=b.initElement(c);b=1;a&&a.screen&&a.screen.deviceXDPI&&a.screen.logicalXDPI&&(b=1*a.screen.deviceXDPI/a.screen.logicalXDPI);if(1!==b)try{$(c).children("object").get(0).resize(Math.ceil(c.width*b),Math.ceil(c.height*b)),c.getContext("2d").scale(b,b)}catch(d){}return!0}throw Error("Canvas element does not support 2d context. jSignature cannot proceed.");}var f="jSignature",u=function(c,a){var b;this.kick=function(){clearTimeout(b);b=setTimeout(a,c)};this.clear=
+function(){clearTimeout(b)};return this},t=function(c){this.topics={};this.context=c?c:this;this.publish=function(a,b,c,e){if(this.topics[a]){var f=this.topics[a],h=Array.prototype.slice.call(arguments,1),m=[],q,g,p,x;g=0;for(p=f.length;gthis.lineCurveThreshold){m=2this.lineCurveThreshold)if(1').appendTo(this.$controlbarLower),k=g.width();g.css("left",Math.round((this.canvas.width-k)/2));k!==g.width()&&g.width(k);return g});r.call(this,g,"jSignature",k)}})})})();
+(function(){for(var r={},k={},g="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWX".split(""),n=g.length/2,s=n-1;-1l&&0a&&(a=1,e.push("Y")),d=Math.abs(l),d>=n?e.push(v(d.toString(n))):e.push(d.toString(n));return e.join("")},f=function(f){var e=
+[];f=f.split("");for(var c=f.length,a,b=1,d=[],l=0,g=0;ga?(a=2c){var a=(new k(e.x[a-2],e.y[a-2])).getVectorToPoint(d),d=b.angleTo(a.reverse()),f=0.35*b.getLength(),a=(new r(a.x+b.x,a.y+b.y)).resizeTo(Math.max(0.05,d)*f);return["c",g(a.x,2),g(a.y,2),g(b.x,
+2),g(b.y,2),g(b.x,2),g(b.y,2)]}return["l",g(b.x,2),g(b.y,2)]}function v(e,c,a){c=["M",g(e.x[0]-c,2),g(e.y[0]-a,2)];a=1;for(var b=e.x.length-1;a',''],b,d=e.length,f,g=[],h=[],m=f=b=0,k=0,n=[];if(0!==d){for(b=0;bd?0:d;k=0>g?0:g;b-=d;f=h-g}a.push('");return a.join("")}function u(e,c){return[C,f(e,c)]}function t(e,c){return[q,y(f(e,c))]}(function(e,c){"use strict";(typeof exports!=
+c+""?exports:e).simplify=function(a,b,d){b=b!==c?b*b:1;if(!d){var e=a.length,f,g=a[0],m=[g];for(d=1;db&&(m.push(f),g=f)}a=(g!==f&&m.push(f),m)}f=a;d=f.length;var e=new (typeof Uint8Array!=c+""?Uint8Array:Array)(d),g=0,m=d-1,p,q,r=[],s=[],y=[];for(e[g]=e[m]=1;m;){n=0;for(k=g+1;kn&&(q=k,n=p)}n>b&&(e[q]=1,r.push(g),s.push(q),r.push(q),s.push(m));g=r.pop();m=s.pop()}for(k=0;k>18&63,b=f>>12&63,d=f>>6&63,f&=63,k[h++]=c[a]+c[b]+c[d]+c[f];while(g -1)) {
+ window.location.href = r.message.redirect_to
+ }
+ }
+ })
+}
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index 652ee1f244..633dc15a45 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -170,11 +170,12 @@ login.login_handlers = (function() {
window.location.href = data.home_page;
}
} else if(window.location.hash === '#forgot') {
- console.log(data.message);
if(data.message==='not found') {
login.set_indicator(__("Not a valid user"), 'red');
} else if (data.message=='not allowed') {
login.set_indicator(__("Not Allowed"), 'red');
+ } else {
+ login.set_indicator(__("Instructions Emailed"), 'green');
}
diff --git a/frappe/templates/pages/integrations/stripe_checkout.html b/frappe/templates/pages/integrations/stripe_checkout.html
new file mode 100644
index 0000000000..0fe5dc0bb1
--- /dev/null
+++ b/frappe/templates/pages/integrations/stripe_checkout.html
@@ -0,0 +1,28 @@
+{% extends "templates/web.html" %}
+
+{% block title %} Payment {% endblock %}
+
+{%- block header -%}{% endblock %}
+
+{% block script %}
+
+
+{% endblock %}
+
+{%- block page_content -%}
+
+.options] }})
+ {% elif df.fieldtype=="Signature" %}
+ 
{% elif df.fieldtype in ("Attach", "Attach Image") and doc[df.fieldname]
and (guess_mimetype(doc[df.fieldname])[0] or "").startswith("image/") %}
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 8630d71c84..1104ff4a8a 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -5,45 +5,72 @@
frappe.upload = {
make: function(opts) {
if(!opts.args) opts.args = {};
+
+ if(opts.allow_multiple === undefined) {
+ opts.allow_multiple = 1
+ }
+
+ var d = null;
+ // create new dialog if no parent given
+ if(!opts.parent) {
+ d = new frappe.ui.Dialog({
+ title: __('Upload Attachment'),
+ primary_action_label: __('Attach'),
+ primary_action: function() {}
+ });
+ opts.parent = d.body;
+ opts.btn = d.get_primary_btn();
+ d.show();
+ }
+
var $upload = $(frappe.render_template("upload", {opts:opts})).appendTo(opts.parent);
var $file_input = $upload.find(".input-upload-file");
+ var $uploaded_files_wrapper = $upload.find('.uploaded-filename');
// bind pseudo browse button
$upload.find(".btn-browse").on("click",
function() { $file_input.click(); });
$file_input.on("change", function() {
- if (this.files.length > 0) {
+ if (this.files.length > 0 || opts.files) {
+ var fileobjs = null;
+
+ if (opts.files) {
+ // files added programmatically
+ fileobjs = opts.files;
+ delete opts.files;
+ } else {
+ // files from input type file
+ fileobjs = $upload.find(":file").get(0).files;
+ }
+ var file_array = $.makeArray(fileobjs);
+
$upload.find(".web-link-wrapper").addClass("hidden");
$upload.find(".btn-browse").removeClass("btn-primary").addClass("btn-default");
+ $uploaded_files_wrapper.removeClass('hidden').empty();
- var $uploaded_file_display = $(repl('
').appendTo(d);this.isCanvasEmulator=!1;a=this.canvas=this.initializeCanvas(e);b=$(a);this.$controlbarLower=$('').appendTo(d);
+this.canvasContext=a.getContext("2d");b.data(f+".this",this);e.lineWidth=function(a,b){return a?a:Math.max(Math.round(b/400),2)}(e.lineWidth,a.width);this.lineCurveThreshold=3*e.lineWidth;e.cssclass&&""!=$.trim(e.cssclass)&&b.addClass(e.cssclass);this.fatFingerCompensation=0;d=function(a){var b,c,d=function(d){d=d.changedTouches&&0\
- \
- \
-
', {filename: this.files[0].name}))
- .appendTo($upload.find(".uploaded-filename").removeClass("hidden").empty());
-
- $uploaded_file_display.find(".uploaded-filename-display").on("click", function() {
- $file_input.click();
- });
-
- $uploaded_file_display.find(".uploaded-file-remove").on("click", function() {
- $file_input.val("");
- $file_input.trigger("change");
- });
-
- if(opts.on_select) {
- opts.on_select();
- }
-
- if ( !("is_private" in opts) ) {
- // show Private checkbox
- $upload.find(".private-file").removeClass("hidden");
- }
+ file_array = file_array.map(
+ file => Object.assign(file, {is_private: 1})
+ )
+ $upload.data('attached_files', file_array);
+ // List of files in a grid
+ $uploaded_files_wrapper.append(`
+
+
+ `);
+ var file_pills = file_array.map(
+ file => frappe.upload.make_file_row(file.name, !("is_private" in opts))
+ );
+ $uploaded_files_wrapper.append(file_pills);
} else {
$upload.find(".uploaded-filename").addClass("hidden")
$upload.find(".web-link-wrapper").removeClass("hidden");
@@ -52,6 +79,40 @@ frappe.upload = {
}
});
+ if(opts.files && opts.files.length > 0) {
+ $file_input.trigger('change');
+ }
+
+ // events
+ $uploaded_files_wrapper.on('click', '.list-item-container', function (e) {
+ var $item = $(this);
+ var filename = $item.attr('data-filename');
+ var attached_files = $upload.data('attached_files');
+ var $target = $(e.target);
+
+ if ($target.is(':checkbox')) {
+ var is_private = $target.is(':checked');
+
+ attached_files = attached_files.map(file => {
+ if (file.name === filename) {
+ file.is_private = is_private ? 1 : 0;
+ }
+ return file;
+ });
+ $upload.data('attached_files', attached_files);
+ }
+ else if ($target.is('.uploaded-file-remove, .fa-remove')) {
+ // remove file from attached_files object
+ attached_files = attached_files.filter(file => file.name !== filename);
+ $upload.data('attached_files', attached_files);
+
+ // remove row from dom
+ $uploaded_files_wrapper
+ .find(`.list-item-container[data-filename="${filename}"]`)
+ .remove();
+ }
+ });
+
if(!opts.btn) {
opts.btn = $('
+ ${__('Filename')}
+
+
+ ${__('Is Private')}
+
+
+
+ + Loading Payment System + +
+ +{% endblock %} + +{% block style %} + +{% endblock %} \ No newline at end of file diff --git a/frappe/templates/pages/integrations/stripe_checkout.py b/frappe/templates/pages/integrations/stripe_checkout.py new file mode 100644 index 0000000000..e79a10fa44 --- /dev/null +++ b/frappe/templates/pages/integrations/stripe_checkout.py @@ -0,0 +1,49 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals +import frappe +from frappe import _ +from frappe.utils import flt, cint +import json + +no_cache = 1 +no_sitemap = 1 + +expected_keys = ('amount', 'title', 'description', 'reference_doctype', 'reference_docname', + 'payer_name', 'payer_email', 'order_id', 'currency') + +def get_context(context): + context.no_cache = 1 + context.publishable_key = get_api_key() + + # all these keys exist in form_dict + if not (set(expected_keys) - set(frappe.form_dict.keys())): + for key in expected_keys: + context[key] = frappe.form_dict[key] + + context['amount'] = flt(context['amount']) + + else: + frappe.redirect_to_message(_('Some information is missing'), + _('Looks like someone sent you to an incomplete URL. Please ask them to look into it.')) + frappe.local.flags.redirect_location = frappe.local.response.location + raise frappe.Redirect + +def get_api_key(): + publishable_key = frappe.db.get_value("Stripe Settings", None, "publishable_key") + if cint(frappe.form_dict.get("use_sandbox")): + publishable_key = frappe.conf.sandbox_publishable_key + + return publishable_key + +@frappe.whitelist(allow_guest=True) +def make_payment(stripe_token_id, data, reference_doctype=None, reference_docname=None): + data = json.loads(data) + + data.update({ + "stripe_token_id": stripe_token_id + }) + + data = frappe.get_doc("Stripe Settings").create_request(data) + frappe.db.commit() + return data \ No newline at end of file diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 0bfdd9d68b..b3c2059887 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -5,7 +5,7 @@{{ frappe.render_template(df.options, {"doc": doc}) or "" }}
{%- elif df.fieldtype in ("Text", "Text Editor", "Code") -%}
{{ render_text_field(df, doc) }}
- {%- elif df.fieldtype in ("Image", "Attach Image", "Attach")
+ {%- elif df.fieldtype in ("Image", "Attach Image", "Attach", "Signature")
and (guess_mimetype(doc[df.fieldname])[0] or "").startswith("image/") -%}
{{ render_image(df, doc) }}
{%- else -%}
@@ -94,7 +94,6 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
{%- endmacro -%}
{%- macro render_image(df, doc) -%}
- {%- if df.label %}{%- endif %}
{{ print_value(df, doc) }}
{% endmacro %}
@@ -108,6 +107,8 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"