From f73eb8af71dc0d524ecd773f93455189af795195 Mon Sep 17 00:00:00 2001
From: TheCartpenter <scoutch@gmail.com>
Date: Mon, 3 Jun 2024 22:17:07 -0400
Subject: [PATCH] Reverted to subscription_id in extension/subscription/paypal
 TWIG file

---
 .../template/extension/recurring/paypal.twig  | 81 -------------------
 .../extension/subscription/paypal.twig        | 32 ++++----
 2 files changed, 16 insertions(+), 97 deletions(-)
 delete mode 100644 upload/catalog/view/theme/default/template/extension/recurring/paypal.twig

diff --git a/upload/catalog/view/theme/default/template/extension/recurring/paypal.twig b/upload/catalog/view/theme/default/template/extension/recurring/paypal.twig
deleted file mode 100644
index 187c853e2..000000000
--- a/upload/catalog/view/theme/default/template/extension/recurring/paypal.twig
+++ /dev/null
@@ -1,81 +0,0 @@
-<div id="paypal_recurring" class="paypal-recurring">
-	{% if ((recurring_status == '2') or (recurring_status == '3')) %}
-	<button type="button" class="btn btn-primary button-enable-recurring">{{ button_enable_recurring }}</button>
-	{% else %}
-	<button type="button" class="btn btn-primary button-disable-recurring">{{ button_disable_recurring }}</button>
-	{% endif %}
-</div>
-<br />
-<script type="text/javascript">
-
-$('#paypal_recurring').on('click', '.button-enable-recurring', function() {
-	$.ajax({
-		type: 'post',
-		url: '{{ enable_url }}',
-		data: {'order_recurring_id' : '{{ order_recurring_id }}'},
-		dataType: 'json',
-		beforeSend: function() {
-			$('#paypal_recurring .btn').prop('disabled', true);
-		},
-		complete: function() {
-			$('#paypal_recurring .btn').prop('disabled', false);
-		},
-		success: function(json) {
-			$('.alert-dismissible').remove();
-			
-			if (json['error'] && json['error']['warning']) {
-				$('#content').parent().before('<div class="alert alert-danger alert-dismissible"><i class="fa fa-exclamation-circle"></i> ' + json['error']['warning'] + ' <button type="button" class="close" data-dismiss="alert">&times;</button></div>');
-				
-				$('html, body').animate({scrollTop: 0}, 'slow');
-			}
-			
-			if (json['success']) {
-				$('#content').parent().before('<div class="alert alert-success alert-dismissible"><i class="fa fa-check-circle"></i> ' + json['success'] + ' <button type="button" class="close" data-dismiss="alert">&times;</button></div>');
-				
-				$('html, body').animate({scrollTop: 0}, 'slow');
-				
-				$('#paypal_recurring').load('{{ info_url }} #paypal_recurring >');
-			}
-		},
-		error: function(xhr, ajaxOptions, thrownError) {
-			console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
-		}
-	});
-});
-
-$('#paypal_recurring').on('click', '.button-disable-recurring', function() {
-	$.ajax({
-		type: 'post',
-		url: '{{ disable_url }}',
-		data: {'order_recurring_id' : '{{ order_recurring_id }}'},
-		dataType: 'json',
-		beforeSend: function() {
-			$('#paypal_recurring .btn').prop('disabled', true);
-		},
-		complete: function() {
-			$('#paypal_recurring .btn').prop('disabled', false);
-		},
-		success: function(json) {
-			$('.alert-dismissible').remove();
-			
-			if (json['error'] && json['error']['warning']) {
-				$('#content').parent().before('<div class="alert alert-danger alert-dismissible"><i class="fa fa-exclamation-circle"></i> ' + json['error']['warning'] + ' <button type="button" class="close" data-dismiss="alert">&times;</button></div>');
-				
-				$('html, body').animate({scrollTop: 0}, 'slow');
-			}
-			
-			if (json['success']) {
-				$('#content').parent().before('<div class="alert alert-success alert-dismissible"><i class="fa fa-check-circle"></i> ' + json['success'] + ' <button type="button" class="close" data-dismiss="alert">&times;</button></div>');
-				
-				$('html, body').animate({scrollTop: 0}, 'slow');
-				
-				$('#paypal_recurring').load('{{ info_url }} #paypal_recurring >');
-			}
-		},
-		error: function(xhr, ajaxOptions, thrownError) {
-			console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
-		}
-	});
-});
-
-</script>
\ No newline at end of file
diff --git a/upload/catalog/view/theme/default/template/extension/subscription/paypal.twig b/upload/catalog/view/theme/default/template/extension/subscription/paypal.twig
index 3f2dd91fb..a73a29927 100644
--- a/upload/catalog/view/theme/default/template/extension/subscription/paypal.twig
+++ b/upload/catalog/view/theme/default/template/extension/subscription/paypal.twig
@@ -1,24 +1,24 @@
-<div class="paypal-subscription" id="paypal-subscription">
-  {% if subscription_status == '2' or subscription_status == '3' %}
-    <button type="button" class="btn btn-primary button-enable-subscription">{{ button_enable_subscription }}</button>
-  {% else %}
-    <button type="button" class="btn btn-primary button-disable-subscription">{{ button_disable_subscription }}</button>
-  {% endif %}
+<div id="paypal_recurring" class="paypal-recurring">
+	{% if ((recurring_status == '2') or (recurring_status == '3')) %}
+	<button type="button" class="btn btn-primary button-enable-recurring">{{ button_enable_recurring }}</button>
+	{% else %}
+	<button type="button" class="btn btn-primary button-disable-recurring">{{ button_disable_recurring }}</button>
+	{% endif %}
 </div>
-<br/>
+<br />
 <script type="text/javascript">
 
-$('#paypal-subscription').on('click', '.button-enable-subscription', function() {
+$('#paypal_recurring').on('click', '.button-enable-recurring', function() {
 	$.ajax({
 		type: 'post',
 		url: '{{ enable_url }}',
-		data: { 'order_subscription_id' : '{{ order_subscription_id }}' },
+		data: {'order_recurring_id' : '{{ order_recurring_id }}'},
 		dataType: 'json',
 		beforeSend: function() {
-			$('#paypal-subscription .btn').prop('disabled', true);
+			$('#paypal_recurring .btn').prop('disabled', true);
 		},
 		complete: function() {
-			$('#paypal-subscription .btn').prop('disabled', false);
+			$('#paypal_recurring .btn').prop('disabled', false);
 		},
 		success: function(json) {
 			$('.alert-dismissible').remove();
@@ -34,7 +34,7 @@ $('#paypal-subscription').on('click', '.button-enable-subscription', function()
 				
 				$('html, body').animate({scrollTop: 0}, 'slow');
 				
-				$('#paypal-subscription').load('{{ info_url }} #paypal-subscription >');
+				$('#paypal_recurring').load('{{ info_url }} #paypal_recurring >');
 			}
 		},
 		error: function(xhr, ajaxOptions, thrownError) {
@@ -43,17 +43,17 @@ $('#paypal-subscription').on('click', '.button-enable-subscription', function()
 	});
 });
 
-$('#paypal-subscription').on('click', '.button-disable-subscription', function() {
+$('#paypal_recurring').on('click', '.button-disable-recurring', function() {
 	$.ajax({
 		type: 'post',
 		url: '{{ disable_url }}',
 		data: {'subscription_id' : '{{ subscription_id }}'},
 		dataType: 'json',
 		beforeSend: function() {
-			$('#paypal-subscription .btn').prop('disabled', true);
+			$('#paypal_recurring .btn').prop('disabled', true);
 		},
 		complete: function() {
-			$('#paypal-subscription .btn').prop('disabled', false);
+			$('#paypal_recurring .btn').prop('disabled', false);
 		},
 		success: function(json) {
 			$('.alert-dismissible').remove();
@@ -69,7 +69,7 @@ $('#paypal-subscription').on('click', '.button-disable-subscription', function()
 				
 				$('html, body').animate({scrollTop: 0}, 'slow');
 				
-				$('#paypal-subscription').load('{{ info_url }} #paypal-subscription >');
+				$('#paypal_recurring').load('{{ info_url }} #paypal_recurring >');
 			}
 		},
 		error: function(xhr, ajaxOptions, thrownError) {