From 66cdb1dad0ebe7b2d16b2da6589d46811d9d5e9a Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Wed, 26 Aug 2020 11:44:35 +0200
Subject: [PATCH 1/6] NEW display resiliate status in takepos for member

---
 htdocs/takepos/invoice.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index d4274d90444..ac076a37993 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -818,7 +818,10 @@ $( document ).ready(function() {
 			$adh->ref = $adh->getFullName($langs);
 			$s .= $adh->getFullName($langs);
 			$s .= ' - '.$adh->type;
-			if ($adh->datefin)
+      		if (empty($adh->statut)) {
+				$s .= '<br>'.$langs->trans("MemberStatusResiliated");
+      		}
+			else if ($adh->datefin)
 			{
 				$s .= '<br>'.$langs->trans("SubscriptionEndDate").': '.dol_print_date($adh->datefin, 'day');
 				if ($adh->hasDelay()) {

From 32ecf4dd9a536d8541256cc65d69cf674e6f6b44 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 26 Aug 2020 09:46:49 +0000
Subject: [PATCH 2/6] Fixing style errors.

---
 htdocs/takepos/invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index ac076a37993..7819c28edb9 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -821,7 +821,7 @@ $( document ).ready(function() {
       		if (empty($adh->statut)) {
 				$s .= '<br>'.$langs->trans("MemberStatusResiliated");
       		}
-			else if ($adh->datefin)
+			elseif ($adh->datefin)
 			{
 				$s .= '<br>'.$langs->trans("SubscriptionEndDate").': '.dol_print_date($adh->datefin, 'day');
 				if ($adh->hasDelay()) {

From 76e276e8e8dfe91648f018734ea0e02f2e51e80e Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Wed, 26 Aug 2020 12:00:45 +0200
Subject: [PATCH 3/6] Update invoice.php

---
 htdocs/takepos/invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 7819c28edb9..0ec346c01d0 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -818,7 +818,7 @@ $( document ).ready(function() {
 			$adh->ref = $adh->getFullName($langs);
 			$s .= $adh->getFullName($langs);
 			$s .= ' - '.$adh->type;
-      		if (empty($adh->statut)) {
+      		if (empty($adh->statut) && $adh->datefin) {
 				$s .= '<br>'.$langs->trans("MemberStatusResiliated");
       		}
 			elseif ($adh->datefin)

From 989130c0ad541ccffd88024fe5666f03a7aa29b2 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Wed, 26 Aug 2020 12:20:49 +0200
Subject: [PATCH 4/6] Update invoice.php

---
 htdocs/takepos/invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0ec346c01d0..1bc43e604e4 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -821,7 +821,7 @@ $( document ).ready(function() {
       		if (empty($adh->statut) && $adh->datefin) {
 				$s .= '<br>'.$langs->trans("MemberStatusResiliated");
       		}
-			elseif ($adh->datefin)
+			else if ($adh->datefin)
 			{
 				$s .= '<br>'.$langs->trans("SubscriptionEndDate").': '.dol_print_date($adh->datefin, 'day');
 				if ($adh->hasDelay()) {

From eecab28203b8b37633ca4c31b9fb0eb7edbc43e4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 26 Aug 2020 10:22:33 +0000
Subject: [PATCH 5/6] Fixing style errors.

---
 htdocs/takepos/invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 1bc43e604e4..0ec346c01d0 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -821,7 +821,7 @@ $( document ).ready(function() {
       		if (empty($adh->statut) && $adh->datefin) {
 				$s .= '<br>'.$langs->trans("MemberStatusResiliated");
       		}
-			else if ($adh->datefin)
+			elseif ($adh->datefin)
 			{
 				$s .= '<br>'.$langs->trans("SubscriptionEndDate").': '.dol_print_date($adh->datefin, 'day');
 				if ($adh->hasDelay()) {

From 6eeb1d3a96471e1fced632e3268bdfa69f8bdb9f Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 29 Aug 2020 13:36:52 +0200
Subject: [PATCH 6/6] Update invoice.php

---
 htdocs/takepos/invoice.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0ec346c01d0..b23d6723ddf 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -816,12 +816,10 @@ $( document ).ready(function() {
 		if ($result > 0)
 		{
 			$adh->ref = $adh->getFullName($langs);
+			if (empty($adh->statut)) { $s .= "<s>"; }
 			$s .= $adh->getFullName($langs);
 			$s .= ' - '.$adh->type;
-      		if (empty($adh->statut) && $adh->datefin) {
-				$s .= '<br>'.$langs->trans("MemberStatusResiliated");
-      		}
-			elseif ($adh->datefin)
+			if ($adh->datefin)
 			{
 				$s .= '<br>'.$langs->trans("SubscriptionEndDate").': '.dol_print_date($adh->datefin, 'day');
 				if ($adh->hasDelay()) {
@@ -831,6 +829,7 @@ $( document ).ready(function() {
 				$s .= '<br>'.$langs->trans("SubscriptionNotReceived");
 				if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
+      		if (empty($adh->statut)) { $s .= "</s>"; }
 		} else {
 			$s .= '<br>'.$langs->trans("ThirdpartyNotLinkedToMember");
 		}