Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2

[POS] Provision to delete the offline records

erpnext/accounts/doctype/pos_profile/pos_profile.json

@@ -309,7 +309,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "allow_partial_payment", 
+   "fieldname": "allow_delete", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -317,7 +317,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Allow Partial Payment", 
+   "label": "Allow Delete", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -400,6 +400,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -426,6 +427,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Groups", 
    "length": 0, 
    "no_copy": 0, 
@@ -454,6 +456,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -480,6 +483,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Groups", 
    "length": 0, 
    "no_copy": 0, 
@@ -1054,7 +1058,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "fa fa-cog", 
+ "icon": "icon-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
@@ -1063,7 +1067,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-17 05:19:52.335433", 
+ "modified": "2016-12-12 17:02:22.323006", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Profile", 

erpnext/accounts/page/pos/pos.js

@@ -107,51 +107,122 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	show_unsync_invoice_list: function(){
 		var me = this;
 		this.si_docs = this.get_doc_from_localstorage();
-
 		this.list_dialog = new frappe.ui.Dialog({
 			title: 'Invoice List'
 		});
 
 		this.list_dialog.show();
 		this.list_body = this.list_dialog.body;
+		if(me.pos_profile_data["allow_delete"]) {
+			this.list_dialog.set_primary_action(__("Delete"), function() {
+				frappe.confirm(__("Delete permanently?"), function () {
+					me.delete_records();
+				})
+			}).addClass("btn-danger");
+			this.toggle_primary_action();
+		}
+
 		if(this.si_docs.length > 0){
-			$(this.list_body).append('<div class="row list-row list-row-head pos-invoice-list">\
+			me.render_offline_data();
-					<div class="col-xs-1">Sr</div>\
+			me.dialog_actions()
-					<div class="col-xs-3">Customer</div>\
-					<div class="col-xs-2 text-left">Status</div>\
-					<div class="col-xs-3 text-right">Paid Amount</div>\
-					<div class="col-xs-3 text-right">Grand Total</div>\
-			</div>')
-
-			$.each(this.si_docs, function(index, data){
-				for(key in data) {
-					$(frappe.render_template("pos_invoice_list", {
-						sr: index + 1,
-						name: key,
-						customer: data[key].customer,
-						paid_amount: format_currency(data[key].paid_amount, me.frm.doc.currency),
-						grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
-						data: me.get_doctype_status(data[key])
-					})).appendTo($(me.list_body));
-				}
-			})
-
-			$(this.list_body).find('.list-row').click(function() {
-				me.name = $(this).attr('invoice-name')
-				doc_data = me.get_invoice_doc(me.si_docs)
-				if(doc_data){
-					me.frm.doc = doc_data[0][me.name];
-					me.set_missing_values();
-					me.refresh(false);
-					me.disable_input_field();
-					me.list_dialog.hide();
-				}
-			})
 		}else{
 			$(this.list_body).append(repl('<div class="media-heading">%(message)s</div>', {'message': __("All records are synced.")}))
 		}
 	},
 
+	render_offline_data: function() {
+		var me = this;
+
+		this.removed_items = [];
+		$(this.list_body).empty();
+
+		$(this.list_body).append('<div class="row list-row list-row-head pos-invoice-list">\
+				<div class="col-xs-1"><input class="list-select-all" type="checkbox"></div>\
+				<div class="col-xs-3">Customer</div>\
+				<div class="col-xs-2 text-left">Status</div>\
+				<div class="col-xs-3 text-right">Paid Amount</div>\
+				<div class="col-xs-3 text-right">Grand Total</div>\
+		</div>')
+
+		$.each(this.si_docs, function(index, data){
+			for(key in data) {
+				$(frappe.render_template("pos_invoice_list", {
+					sr: index + 1,
+					name: key,
+					customer: data[key].customer,
+					paid_amount: format_currency(data[key].paid_amount, me.frm.doc.currency),
+					grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
+					data: me.get_doctype_status(data[key])
+				})).appendTo($(me.list_body));
+			}
+		})
+	},
+
+	dialog_actions: function() {
+		var me = this;
+
+		$(this.list_body).find('.list-column').click(function() {
+			me.name = $(this).parents().attr('invoice-name')
+			me.edit_record();
+		})
+
+		$(this.list_body).find('.list-select-all').click(function() {
+			me.removed_items = [];
+			$(me.list_body).find('.list-delete').prop("checked", $(this).is(":checked"))
+			if($(this).is(":checked")) {
+				$.each(me.si_docs, function(index, data){
+					for(key in data) {
+						me.removed_items.push(key)
+					}
+				})
+			}
+
+			me.toggle_primary_action();
+		})
+
+		$(this.list_body).find('.list-delete').click(function() {
+			me.name = $(this).parent().parent().attr('invoice-name');
+			if($(this).is(":checked")) {
+				me.removed_items.push(me.name);
+			} else {
+				me.removed_items.pop(me.name)
+			}
+
+			me.toggle_primary_action();
+		})
+	},
+
+	edit_record: function() {
+		var me = this;
+
+		doc_data = this.get_invoice_doc(this.si_docs);
+		if(doc_data){
+			this.frm.doc = doc_data[0][this.name];
+			this.set_missing_values();
+			this.refresh(false);
+			this.disable_input_field();
+			this.list_dialog.hide();
+		}
+	},
+
+	delete_records: function() {
+		var me = this;
+		this.remove_doc_from_localstorage()
+		this.update_localstorage();
+		this.render_offline_data();
+		this.dialog_actions();
+		this.toggle_primary_action();
+	},
+
+	toggle_primary_action: function() {
+		var me = this;
+		if(this.removed_items && this.removed_items.length > 0) {
+			$(this.list_dialog.wrapper).find('.btn-danger').show();
+		} else {
+			$(this.list_dialog.wrapper).find('.btn-danger').hide();
+		}
+	},
+
 	get_doctype_status: function(doc){
 		if(doc.docstatus == 0) {
 			return {status: "Draft", indicator: "red"}
@@ -229,7 +300,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	},
 
 	save_previous_entry : function(){
-		if(this.frm.doc.items.length > 0){
+		if(this.frm.doc.docstatus < 1 && this.frm.doc.items.length > 0){
 			this.create_invoice()
 		}
 	},
@@ -256,7 +327,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 			frappe.meta.sync(data)
 		})
 
-		this.print_template = frappe.render_template("print_template",
+		this.print_template_data = frappe.render_template("print_template",
 			{content: this.print_template, title:"POS",
 			base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css})
 	},
@@ -736,7 +807,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 			}, "octicon octfa fa-credit-card");
 		}else if(this.frm.doc.docstatus == 1) {
 			this.page.set_primary_action(__("Print"), function() {
-				html = frappe.render(me.print_template, me.frm.doc)
+				html = frappe.render(me.print_template_data, me.frm.doc)
 				me.print_document(html)
 			})
 		}else {
@@ -759,7 +830,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		]));
 
 		$('.print_doc').click(function(){
-			html = frappe.render(me.print_template, me.frm.doc)
+			html = frappe.render(me.print_template_data, me.frm.doc)
 			me.print_document(html)
 		})
 

erpnext/public/js/pos/pos_invoice_list.html

@@ -1,7 +1,7 @@
 <div class="row list-row pos-invoice-list" invoice-name = "{{name}}">
-	<div class="col-xs-1">{%= sr %}</div>
+	<div class="col-xs-1"><input class="list-delete" type="checkbox"></div>
-	<div class="col-xs-3">{%= customer %}</div>
+	<div class="list-column col-xs-3">{%= customer %}</div>
-	<div class="col-xs-2 text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
+	<div class="list-column col-xs-2 text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
-	<div class="col-xs-3 text-right">{%= paid_amount %}</div>
+	<div class="list-column col-xs-3 text-right">{%= paid_amount %}</div>
-	<div class="col-xs-3 text-right">{%= grand_total %}</div>
+	<div class="list-column col-xs-3 text-right">{%= grand_total %}</div>
 </div>