From 9ce14030d6c829ae3bccbab4700f3aeda3620523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Hjermitslev=20Gj=C3=B8derum?= Date: Wed, 23 Nov 2016 12:42:33 +0100 Subject: [PATCH 1/4] Added deep link to MobilePay --- feer_club/feer/templates/feer/order_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feer_club/feer/templates/feer/order_detail.html b/feer_club/feer/templates/feer/order_detail.html index 8914eb4..4ff102c 100755 --- a/feer_club/feer/templates/feer/order_detail.html +++ b/feer_club/feer/templates/feer/order_detail.html @@ -17,7 +17,7 @@ {% for p, c in costs %} {{ p }} - {{ c }} + {{ c }} (Pay with MobilePay) {% endfor %} From 5234db663661eb82fb79f255b13c3a192b550f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Hjermitslev=20Gj=C3=B8derum?= Date: Thu, 24 Nov 2016 15:28:47 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Bruger=20kun=20django=20variabler=20nu=20i?= =?UTF-8?q?=20stedet=20for=20kode=20ogs=C3=A5.=20Var=20ikke=20n=C3=B8dvend?= =?UTF-8?q?igt=20anyways?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feer_club/feer/templates/feer/order_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feer_club/feer/templates/feer/order_detail.html b/feer_club/feer/templates/feer/order_detail.html index 4ff102c..43d1948 100755 --- a/feer_club/feer/templates/feer/order_detail.html +++ b/feer_club/feer/templates/feer/order_detail.html @@ -17,7 +17,7 @@ {% for p, c in costs %} {{ p }} - {{ c }} (Pay with MobilePay) + {{ c }} (Pay with MobilePay) {% endfor %} From 3eeb205cb122ac44220a8fce44223f5c13c6d076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Hjermitslev=20Gj=C3=B8derum?= Date: Thu, 24 Nov 2016 15:52:52 +0100 Subject: [PATCH 3/4] Only print MobilePay for the user that is logged in --- feer_club/feer/templates/feer/order_detail.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/feer_club/feer/templates/feer/order_detail.html b/feer_club/feer/templates/feer/order_detail.html index 43d1948..9fe1741 100755 --- a/feer_club/feer/templates/feer/order_detail.html +++ b/feer_club/feer/templates/feer/order_detail.html @@ -17,7 +17,11 @@ {% for p, c in costs %} {{ p }} - {{ c }} (Pay with MobilePay) + {{ c }} + {% if user|stringformat:"s" == p %} + (Pay with MobilePay) + {% endif %} + {% endfor %} From 9a1afc9fc7585addead158b1994f58303cfdc249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Hjermitslev=20Gj=C3=B8derum?= Date: Fri, 25 Nov 2016 12:43:19 +0100 Subject: [PATCH 4/4] Only show mobilepay link if order is not updateable --- feer_club/feer/templates/feer/order_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feer_club/feer/templates/feer/order_detail.html b/feer_club/feer/templates/feer/order_detail.html index 9fe1741..8e1f91f 100755 --- a/feer_club/feer/templates/feer/order_detail.html +++ b/feer_club/feer/templates/feer/order_detail.html @@ -18,7 +18,7 @@ {{ p }} {{ c }} - {% if user|stringformat:"s" == p %} + {% if not order.updatable and user|stringformat:"s" == p %} (Pay with MobilePay) {% endif %}