+
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc
index 555d7980..78855eab 100644
Binary files a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc
index 016623f6..eec184b2 100644
Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc
index 362df0c9..6baf9b7e 100644
Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc
index bad42f53..0e86673c 100644
Binary files a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc differ
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index 8d02fbf1..d8d6bcfa 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -1,5 +1,5 @@
/*
-! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
*/
/*
@@ -32,11 +32,9 @@
4. Use the user's configured `sans` font-family by default.
5. Use the user's configured `sans` font-feature-settings by default.
6. Use the user's configured `sans` font-variation-settings by default.
-7. Disable tap highlights on iOS
*/
-html,
-:host {
+html {
line-height: 1.5;
/* 1 */
-webkit-text-size-adjust: 100%;
@@ -46,14 +44,12 @@ html,
-o-tab-size: 4;
tab-size: 4;
/* 3 */
- font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+ font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
/* 4 */
font-feature-settings: normal;
/* 5 */
font-variation-settings: normal;
/* 6 */
- -webkit-tap-highlight-color: transparent;
- /* 7 */
}
/*
@@ -125,10 +121,8 @@ strong {
}
/*
-1. Use the user's configured `mono` font-family by default.
-2. Use the user's configured `mono` font-feature-settings by default.
-3. Use the user's configured `mono` font-variation-settings by default.
-4. Correct the odd `em` font sizing in all browsers.
+1. Use the user's configured `mono` font family by default.
+2. Correct the odd `em` font sizing in all browsers.
*/
code,
@@ -137,12 +131,8 @@ samp,
pre {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
/* 1 */
- font-feature-settings: normal;
- /* 2 */
- font-variation-settings: normal;
- /* 3 */
font-size: 1em;
- /* 4 */
+ /* 2 */
}
/*
@@ -688,6 +678,10 @@ video {
bottom: 0px;
}
+.-bottom-10 {
+ bottom: -2.5rem;
+}
+
.-bottom-2 {
bottom: -0.5rem;
}
@@ -696,10 +690,30 @@ video {
bottom: -1rem;
}
+.-bottom-5 {
+ bottom: -1.25rem;
+}
+
+.-bottom-8 {
+ bottom: -2rem;
+}
+
+.-right-10 {
+ right: -2.5rem;
+}
+
.-right-40 {
right: -10rem;
}
+.-right-5 {
+ right: -1.25rem;
+}
+
+.-right-8 {
+ right: -2rem;
+}
+
.-top-10 {
top: -2.5rem;
}
@@ -808,6 +822,10 @@ video {
top: 1.25rem;
}
+.top-\[-50px\] {
+ top: -50px;
+}
+
.top-\[14px\] {
top: 14px;
}
@@ -861,6 +879,10 @@ video {
margin-bottom: 0.5rem;
}
+.mb-20 {
+ margin-bottom: 5rem;
+}
+
.mb-4 {
margin-bottom: 1rem;
}
@@ -905,6 +927,10 @@ video {
margin-top: 3.5rem;
}
+.mt-16 {
+ margin-top: 4rem;
+}
+
.mt-2 {
margin-top: 0.5rem;
}
@@ -1105,10 +1131,6 @@ video {
height: 8px;
}
-.h-\[90\%\] {
- height: 90%;
-}
-
.h-auto {
height: auto;
}
@@ -1131,10 +1153,6 @@ video {
height: 100vh;
}
-.max-h-\[700px\] {
- max-height: 700px;
-}
-
.w-1 {
width: 0.25rem;
}
@@ -1163,10 +1181,6 @@ video {
width: 13px;
}
-.w-\[150px\] {
- width: 150px;
-}
-
.w-\[180px\] {
width: 180px;
}
@@ -1183,10 +1197,6 @@ video {
width: 22px;
}
-.w-\[230px\] {
- width: 230px;
-}
-
.w-\[25\%\] {
width: 25%;
}
@@ -1289,7 +1299,7 @@ video {
}
.max-w-0 {
- max-width: 0px;
+ max-width: 0rem;
}
.max-w-2xl {
@@ -1710,6 +1720,11 @@ video {
border-color: rgb(156 163 175 / var(--tw-border-opacity));
}
+.border-gray-50 {
+ --tw-border-opacity: 1;
+ border-color: rgb(249 250 251 / var(--tw-border-opacity));
+}
+
.border-gray-500 {
--tw-border-opacity: 1;
border-color: rgb(107 114 128 / var(--tw-border-opacity));
@@ -2464,6 +2479,11 @@ video {
color: rgb(37 99 235 / var(--tw-text-opacity));
}
+.text-fifthosiblue {
+ --tw-text-opacity: 1;
+ color: rgb(146 156 183 / var(--tw-text-opacity));
+}
+
.text-gray-200 {
--tw-text-opacity: 1;
color: rgb(229 231 235 / var(--tw-text-opacity));
@@ -2910,48 +2930,17 @@ video {
/* CUSTOMER DASHBOARD PAYMENT */
-#paymentContent {
- height: 100% !important;
- position: relative !important;
- max-height: 100% !important;
- margin-top: 20px;
- overflow-y: auto !important;
-}
-
#paymentContent iframe {
- position: relative !important;
- height: 100% !important;
- overflow-y: auto !important;
+ min-height: -moz-fit-content !important;
+ min-height: fit-content !important;
}
-#paymentContent::-webkit-scrollbar {
- width: 5px;
- border-radius: 10px;
-}
-
-#paymentContent::-webkit-scrollbar-thumb {
- background: rgba(208, 208, 208, 0.377);
- border-radius: 10px;
-}
-
-#paymentContent::-webkit-scrollbar-track {
- background: transparent;
-}
-
-/* CUSTOMER DASHBOARD PAYMENT CLOSURE */
-
.hover\:scale-105:hover {
--tw-scale-x: 1.05;
--tw-scale-y: 1.05;
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
}
-.hover\:scale-110:hover {
- --tw-scale-x: 1.1;
- --tw-scale-y: 1.1;
- transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
.hover\:bg-gray-50:hover {
--tw-bg-opacity: 1;
background-color: rgb(249 250 251 / var(--tw-bg-opacity));
@@ -3337,6 +3326,10 @@ video {
width: 75%;
}
+ .xxlg1\:grid-cols-2 {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+
.xxlg1\:grid-cols-3 {
grid-template-columns: repeat(3, minmax(0, 1fr));
}
diff --git a/osinaweb/static/images/icons/cart.png b/osinaweb/static/images/icons/cart.png
new file mode 100644
index 00000000..bb92e090
Binary files /dev/null and b/osinaweb/static/images/icons/cart.png differ
diff --git a/osinaweb/static/images/icons/download.png b/osinaweb/static/images/icons/download.png
new file mode 100644
index 00000000..61a62c49
Binary files /dev/null and b/osinaweb/static/images/icons/download.png differ
diff --git a/osinaweb/static/images/netcommercelogo.gif b/osinaweb/static/images/netcommercelogo.gif
new file mode 100644
index 00000000..ba7ee573
Binary files /dev/null and b/osinaweb/static/images/netcommercelogo.gif differ
diff --git a/osinaweb/static/images/ositcom_logos/full-logo.png b/osinaweb/static/images/ositcom_logos/full-logo.png
new file mode 100644
index 00000000..e765d529
Binary files /dev/null and b/osinaweb/static/images/ositcom_logos/full-logo.png differ
diff --git a/osinaweb/static/js/customer_dashboard/payment.js b/osinaweb/static/js/customer_dashboard/payment.js
index 84671f30..8f71c79c 100644
--- a/osinaweb/static/js/customer_dashboard/payment.js
+++ b/osinaweb/static/js/customer_dashboard/payment.js
@@ -1,16 +1,6 @@
-const displayPaymentModalButtons = document.querySelectorAll('.displayPaymentModal');
-const closeButton = document.querySelector('#closePaymentModalButton');
-const paymentModal = document.getElementById('paymentModal');
+const paymentContent = document.getElementById('paymentContent');
-displayPaymentModalButtons.forEach(function (button) {
- button.addEventListener('click', function () {
- const item_id = button.getAttribute('item-id');
- paymentModal.classList.remove('hidden');
- document.body.style.overflow = 'hidden';
-
- initiateCheckout(item_id);
- });
-});
+const item_id = document.getElementById('itemId').textContent;
function initiateCheckout(item_id) {
const csrftoken = getCookie('csrftoken');
@@ -23,41 +13,35 @@ function initiateCheckout(item_id) {
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': csrftoken,
- 'X-Item-ID': item_id
+ 'X-Item-ID': item_id,
},
body: JSON.stringify({ item_id: item_id }),
})
- .then(response => {
- if (!response.ok) {
- throw new Error('Network response was not ok');
- }
- return response.json();
- })
- .then(data => {
- // Handle success response
- console.log("Session ID: " + data.session_id);
- // Update Checkout session with the fetched session ID and show the embedded page
- Checkout.configure({
- session: {
- id: data.session_id,
+ .then(response => {
+ if (!response.ok) {
+ throw new Error('Network response was not ok');
}
+ return response.json();
+ })
+ .then(data => {
+ // Handle success response
+ console.log("Session ID: " + data.session_id);
+ // Update Checkout session with the fetched session ID and show the embedded page
+ Checkout.configure({
+ session: {
+ id: data.session_id,
+ }
+ });
+ $('#paymentContent').empty();
+ Checkout.showEmbeddedPage('#paymentContent');
+ sessionStorage.clear();
+ })
+ .catch(error => {
+ console.error('There was a problem with the fetch operation:', error);
});
- $('#paymentContent').empty();
- Checkout.showEmbeddedPage('#paymentContent', () => { $('#paymentModal').modal(); });
- })
- .catch(error => {
- console.error('There was a problem with the fetch operation:', error);
- });
}
-closeButton.addEventListener('click', function () {
- paymentModal.classList.add('hidden');
- sessionStorage.clear();
- document.body.style.overflow = '';
-});
-
-
function getCookie(name) {
let cookieValue = null;
if (document.cookie && document.cookie !== '') {
@@ -72,3 +56,6 @@ function getCookie(name) {
}
return cookieValue;
}
+
+
+initiateCheckout(item_id);
- 
- 
+
+ 
+