-
- CASH Total: ${{ total_amount }}
+
+
+
+
+ Price / Gallon:
+
+
+ {{ delivery.customer_price }}
+
+
+
+
+ Gallons Ordered:
+
+
+
+
FILL (250)
+
Gallons Ordered: {{ delivery.gallons_ordered }}
+
+
+
+ Prime Fee: {{ pricing.price_prime }}
+
+
+ Same Day: {{ pricing.price_same_day }}
+
+
+
+
+ CASH Total: ${{ total_amount }}
+
+
+
+
+ Pre Charge Credit Card Total: ${{ total_amount }}
+
+
+
+
+ Pre Charge Credit Card Total: ${{ total_amount }}
+
+
+
+
+ Pre Charge Credit Card Total: ${{ total_amount }}
+
-
-
- Pre Charge Credit Card Total: ${{ total_amount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- Pre Charge Credit Card Total: ${{ total_amount }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Cash +
-
@@ -291,7 +324,8 @@ export default defineComponent({
},
priceprime: 0,
pricesameday: 0,
- total_amount: 0
+ total_amount: 0,
+ total_precharge_amount: 0
}
},
validations() {
@@ -315,24 +349,36 @@ export default defineComponent({
},
mounted() {
this.getOilOrder(this.$route.params.id)
+ this.sumdelivery(this.$route.params.id);
this.getOilPricing()
// this.getStripePublishableKey();
},
methods: {
- sumdelivery() {
- if (this.delivery.same_day == 1)
- this.pricesameday = this.pricing.price_same_day
- else { this.pricesameday = 0 };
+ sumdelivery(delivery_id: any) {
+ let path = import.meta.env.VITE_BASE_URL + "/delivery/total/" + delivery_id;
+ axios({
+ method: "get",
+ url: path,
+ withCredentials: true,
+ })
+ .then((response: any) => {
+ if (response.data.ok) {
+ this.priceprime = response.data.priceprime;
+ this.pricesameday = response.data.pricesameday;
+ this.total_amount = response.data.total_amount;
- if (this.delivery.prime == 1)
- this.priceprime = this.pricing.price_prime
- else { this.priceprime = 0 };
-
- this.total_amount = Number(this.delivery.total_price) + Number(this.priceprime) + Number(this.pricesameday)
+ }
- this.loaded = true
+ })
+ .catch(() => {
+ notify({
+ title: "Error",
+ text: "Could not get oil pricing",
+ type: "error",
+ });
+ });
},
@@ -361,8 +407,8 @@ export default defineComponent({
})
.then((response: any) => {
this.pricing = response.data;
-
- this.sumdelivery();
+
+
})
.catch(() => {
@@ -448,6 +494,13 @@ export default defineComponent({
})
.then((response: any) => {
if (response.data.ok) {
+ if (payment_type == 0) {
+ notify({
+ title: "Success",
+ text: "marked payment as cash (COD)",
+ type: "success",
+ });
+ }
if (payment_type == 1) {
notify({
title: "Success",
@@ -455,7 +508,15 @@ export default defineComponent({
type: "success",
});
}
- if (payment_type == 0) {
+
+ if (payment_type == 2) {
+ notify({
+ title: "Success",
+ text: "marked payment as cash (COD)",
+ type: "success",
+ });
+ }
+ if (payment_type == 3) {
notify({
title: "Success",
text: "marked payment as cash (COD)",
diff --git a/src/pages/pay/pay_service.vue b/src/pages/pay/pay_service.vue
deleted file mode 100755
index 221b7f8..0000000
--- a/src/pages/pay/pay_service.vue
+++ /dev/null
@@ -1,465 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- Confirm Payment Service Call {{ service_id }}
-
-
-
-
{{ customer.account_number }}
-
- {{ customer.customer_first_name }}
- {{ customer.customer_last_name }}
-
-
- {{ customer.customer_address }}
-
- {{ customer.customer_apt }}
-
-
-
-
- {{ customer.customer_town }},
-
-
-
Massachusetts
-
Rhode Island
-
New Hampshire
-
Maine
-
Vermont
-
Maine
-
New York
-
Unknown state
-
-
- {{ customer.customer_zip }}
-
-
-
- {{ customer.customer_apt }}
-
-
-
Residential
-
apartment
-
condo
-
commercial
-
business
-
construction
-
container
-
-
- {{ customer.customer_phone_number }}
-
-
-
-
-
-
-
Service Type: General
-
Service Type: Cleaning / Tuneup
-
Service Type: No Heat
-
Service Type: Install
-
Service Type: Call Back
-
Service Type: Quote
-
Service Type: Emergency
-
-
-
Tech: {{ service.tech_first_name }} {{ service.tech_last_name }}
-
Expected Service Date: {{ service.scheduled_date }}
-
-
-
-
-
-
-
-
-
-
- {{ card.type_of_card }}
-
-
- {{ card.name_on_card }}
-
-
- {{ card.card_number }}
-
-
- {{ card.expiration_month }}/ {{ card.expiration_year }}
-
-
- {{ card.security_number }}
-
-
-
-
-
-
- {{ card.type_of_card }}
-
-
- {{ card.name_on_card }}
-
-
- {{ card.card_number }}
-
-
- {{ card.expiration_month }}/ {{ card.expiration_year }}
-
-
- {{ card.security_number }}
-
-
-
-
-
-
-
-
-
Price / hour: {{ service_prices.price_service_hour }}
-
Pay Method: Cash (COD)
-
Pay Method: Credit Card
-
Pay Method: Stripe
-
Pay Method: Cash/Credit Mix
-
Pre-Charge: 300$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/pay/routes.ts b/src/pages/pay/routes.ts
index daad197..956a1db 100755
--- a/src/pages/pay/routes.ts
+++ b/src/pages/pay/routes.ts
@@ -1,32 +1,19 @@
import PayOil from '../pay/pay_oil.vue';
-import PayService from "../pay/pay_service.vue";
-import PaySuccess from "../pay/success.vue";
-import PayCancel from "../pay/cancel.vue";
+
+
const payRoutes = [
- {
- path: '/pay/service/:id',
- name: 'payService',
- component: PayService,
- },
+
{
path: '/pay/oil/:id',
name: 'payOil',
component: PayOil,
},
- {
- path: '/pay/success',
- name: 'paySuccess',
- component: PaySuccess,
- },
- {
- path: '/pay/cancel',
- name: 'payCancel',
- component: PayCancel,
- },
+
+
]
export default payRoutes
diff --git a/src/pages/pay/success.vue b/src/pages/pay/success.vue
deleted file mode 100755
index 1d4c5ec..0000000
--- a/src/pages/pay/success.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-
-
-
-
-
-
-
-
-
- -
-
- Home
-
-
- -
-
- Edit Delivery
-
-
-
-
-
-
-
-
Create Oil Delivery {{ customer_id }}
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file