From d9d4ffbecfb900e4ae967b059137bee0295130d9 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 27 Apr 2024 01:44:39 +0800
Subject: [PATCH 01/27] Add static content endpoint for customer app #799

---
 config/routes/apiv2.yaml                      |  8 ++++-
 .../StaticContentController.php               | 34 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 src/Controller/CustomerAppAPI/StaticContentController.php

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index dc603c9f..4041b372 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -312,4 +312,10 @@ apiv2_insurance_premiums_banner:
 apiv2_insurance_body_types:
     path: /apiv2/insurance/body_types
     controller: App\Controller\CustomerAppAPI\InsuranceController::getBodyTypes
-    methods: [GET]
\ No newline at end of file
+    methods: [GET]
+
+# static content
+apiv2_static_content:
+    path: /apiv2/static_content/{id}
+    controller: App\Controller\CustomerAppAPI\StaticContentController::getContent
+    methods: [GET]
diff --git a/src/Controller/CustomerAppAPI/StaticContentController.php b/src/Controller/CustomerAppAPI/StaticContentController.php
new file mode 100644
index 00000000..868eea40
--- /dev/null
+++ b/src/Controller/CustomerAppAPI/StaticContentController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Controller\CustomerAppAPI;
+
+use Symfony\Component\HttpFoundation\Request;
+use Catalyst\ApiBundle\Component\Response as ApiResponse;
+
+use App\Entity\StaticContent;
+
+class StaticContentController extends ApiController
+{
+    public function getContent(Request $req, $id)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get content
+        $content = $this->em->getRepository(Staticcontent::class)->find($id);
+
+        // check if it exists
+        if ($content == null) {
+            return new ApiResponse(false, 'Requested content does not exist.');
+        }
+
+        // response
+        return new ApiResponse(true, '', [
+            'content' => $content->content,
+        ]);
+    }
+}

From c9cb6e8b53ecb7e9147481aa512f4bff4eee1cda Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 27 Apr 2024 01:45:25 +0800
Subject: [PATCH 02/27] Add markdown support to static content form view #799

---
 templates/static-content/form.html.twig | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/templates/static-content/form.html.twig b/templates/static-content/form.html.twig
index dece1005..3f078773 100644
--- a/templates/static-content/form.html.twig
+++ b/templates/static-content/form.html.twig
@@ -48,7 +48,7 @@
                                     <label data-field="content">
                                         Content
                                     </label>
-                                    <textarea name="content" class="form-control m-input" data-name="content" rows="50">{{ obj.getContent() }}</textarea>
+                                    <textarea id="content" name="content" class="form-control m-input" data-name="content" rows="50">{{ obj.getContent() }}</textarea>
                                     <div class="form-control-feedback hide" data-field="content"></div>
                                 </div>
                             </div>
@@ -70,8 +70,19 @@
     </div> 
 {% endblock %}
 
+{% block stylesheets %}
+<link rel="stylesheet" href="https://unpkg.com/easymde/dist/easymde.min.css">
+{% endblock %}
+
 {% block scripts %}
+<script src="https://unpkg.com/easymde/dist/easymde.min.js"></script>
 <script>
+    // load markdown editor
+    const mde = new EasyMDE({
+        element: document.getElementById('content'),
+        spellChecker: false,
+    });
+
     $(function() {
         $("#row-form").submit(function(e) {
             var form = $(this);

From 2ccd1e0e2d689fa8e9932b037d6473dd846d1d44 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 29 Apr 2024 18:07:00 +0800
Subject: [PATCH 03/27] Use proper getter for static content API #799

---
 src/Controller/CustomerAppAPI/StaticContentController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/CustomerAppAPI/StaticContentController.php b/src/Controller/CustomerAppAPI/StaticContentController.php
index 868eea40..0dec39cb 100644
--- a/src/Controller/CustomerAppAPI/StaticContentController.php
+++ b/src/Controller/CustomerAppAPI/StaticContentController.php
@@ -28,7 +28,7 @@ class StaticContentController extends ApiController
 
         // response
         return new ApiResponse(true, '', [
-            'content' => $content->content,
+            'content' => $content->getContent(),
         ]);
     }
 }

From 48d87ae1199d2f287a7f6b67791f0fc9dcb9e263 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 5 May 2024 07:13:07 +0800
Subject: [PATCH 04/27] Retrieve subscription data with customer vehicle info
 endpoint #799

---
 .../CustomerAppAPI/VehicleController.php      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Controller/CustomerAppAPI/VehicleController.php b/src/Controller/CustomerAppAPI/VehicleController.php
index c8fd15e9..0b5fdc57 100644
--- a/src/Controller/CustomerAppAPI/VehicleController.php
+++ b/src/Controller/CustomerAppAPI/VehicleController.php
@@ -139,7 +139,7 @@ class VehicleController extends ApiController
 
         // response
         return new ApiResponse(true, '', [
-            'vehicle' => $this->generateVehicleInfo($cv, true, $paymongo),
+            'vehicle' => $this->generateVehicleInfo($cv, true, true, $paymongo),
         ]);
     }
 
@@ -231,7 +231,7 @@ class VehicleController extends ApiController
         // only get the customer's vehicles whose flag_active is true
         $cvs = $this->em->getRepository(CustomerVehicle::class)->findBy(['flag_active' => true, 'customer' => $cust]);
         foreach ($cvs as $cv) {
-            $cv_list[] = $this->generateVehicleInfo($cv, true, $paymongo);
+            $cv_list[] = $this->generateVehicleInfo($cv, true, true, $paymongo);
         }
 
         // response
@@ -417,7 +417,7 @@ class VehicleController extends ApiController
         ];
     }
 
-    protected function generateVehicleInfo(CustomerVehicle $cv, $include_insurance = false, PayMongoConnector $paymongo)
+    protected function generateVehicleInfo(CustomerVehicle $cv, $include_insurance = false, $include_active_sub = false, PayMongoConnector $paymongo)
     {
         $battery_id = null;
         if ($cv->getCurrentBattery() != null)
@@ -437,6 +437,8 @@ class VehicleController extends ApiController
             'cv_id' => $cv->getID(),
             'mfg_id' => $cv->getVehicle()->getManufacturer()->getID(),
             'make_id' => $cv->getVehicle()->getID(),
+            'mfg_name' => $cv->getVehicle()->getManufacturer()->getName(),
+            'make_name' => $cv->getVehicle()->getMake(),
             'name' => $cv_name,
             'plate_num' => $cv->getPlateNumber(),
             'model_year' => $cv->getModelYear(),
@@ -506,6 +508,17 @@ class VehicleController extends ApiController
             $row['latest_insurance'] = $insurance;
         }
 
+        // get active subscription row
+        if ($include_active_sub) {
+            $active_sub = null;
+            $sobj = $cv->getLatestActiveSubscription();
+            if (!empty($sobj)) {
+
+            }
+
+            $row['active_subscription'] = $active_sub;
+        }
+
         return $row;
     }
 

From 627b3da748a7be7f478fbca419fe86a446184cc1 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 5 May 2024 07:14:26 +0800
Subject: [PATCH 05/27] Disallow editing of IDs of static content #799

---
 src/Controller/StaticContentController.php | 10 +---------
 templates/static-content/form.html.twig    |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Controller/StaticContentController.php b/src/Controller/StaticContentController.php
index 44c77595..95b9c8bd 100644
--- a/src/Controller/StaticContentController.php
+++ b/src/Controller/StaticContentController.php
@@ -212,8 +212,7 @@ class StaticContentController extends Controller
             throw $this->createNotFoundException('The item does not exist');
 
         // set and save values
-        $row->setID($req->request->get('id'))
-            ->setContent($req->request->get('content'));
+        $row->setContent($req->request->get('content'));
 
         // validate
         $errors = $validator->validate($row);
@@ -221,13 +220,6 @@ class StaticContentController extends Controller
         // initialize error list
         $error_array = [];
 
-        // check for duplicate ID
-        $result = $em->getRepository(StaticContent::class)->find($id);
-        if ($result != null)
-        {
-            $error_array['id'] = 'Duplicate ID exists.';
-        }
-
         // add errors to list
         foreach ($errors as $error) {
             $error_array[$error->getPropertyPath()] = $error->getMessage();
diff --git a/templates/static-content/form.html.twig b/templates/static-content/form.html.twig
index 3f078773..0a1f4f0d 100644
--- a/templates/static-content/form.html.twig
+++ b/templates/static-content/form.html.twig
@@ -39,7 +39,7 @@
                                     <label data-field="id">
                                         ID:
                                     </label>
-                                    <input type="text" name="id" class="form-control m-input" value="{{ obj.getID() }}">
+                                    <input type="text" name="id" class="form-control m-input" value="{{ obj.getID() }}" {{ mode == 'update' ? 'disabled' }}>
                                     <div class="form-control-feedback hide" data-field="id"></div>
                                 </div>
                             </div>

From ab64161afbf3b8d3104a5becba6dc580644a3222 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Fri, 10 May 2024 14:42:58 +0800
Subject: [PATCH 06/27] Add placeholder customer vehicle sub getter #799

---
 src/Entity/CustomerVehicle.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Entity/CustomerVehicle.php b/src/Entity/CustomerVehicle.php
index a569d4b2..f36c1de5 100644
--- a/src/Entity/CustomerVehicle.php
+++ b/src/Entity/CustomerVehicle.php
@@ -306,4 +306,10 @@ class CustomerVehicle
 
         return !empty($result) ? $result[0] : null;
     }
+
+    public function getLatestActiveSubscription()
+    {
+        // TODO: get latest active sub using relationship to be built
+        return null;
+    }
 }

From fe4806f41a1ecf5ffe33da62e7d91c3f5bd66acc Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 3 Aug 2024 06:31:12 +0800
Subject: [PATCH 07/27] Add endpoint for retrieving subscription fee #799

---
 config/routes/apiv2.yaml                      |  6 +++++
 config/services.yaml                          |  1 +
 .../CustomerAppAPI/SubscriptionController.php | 24 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 src/Controller/CustomerAppAPI/SubscriptionController.php

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index 4041b372..50c18fb8 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -319,3 +319,9 @@ apiv2_static_content:
     path: /apiv2/static_content/{id}
     controller: App\Controller\CustomerAppAPI\StaticContentController::getContent
     methods: [GET]
+
+# subscription
+apiv2_subscription_fee:
+    path: /apiv2/subscription/fee
+    controller: App\Controller\CustomerAppAPI\SubscriptionController::getRecurringFee
+    methods: [GET]
\ No newline at end of file
diff --git a/config/services.yaml b/config/services.yaml
index 6af4a5d3..0430a9d6 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -17,6 +17,7 @@ parameters:
     ios_app_version: "%env(IOS_APP_VERSION)%"
     insurance_premiums_banner_url: "%env(INSURANCE_PREMIUMS_BANNER_URL)%"
     enabled_hub_filters: "%env(ENABLED_HUB_FILTERS)%"
+    subscription_recurring_fee: "%env(SUBSCRIPTION_RECURRING_FEE)%"
 
 services:
     # default configuration for services in *this* file
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
new file mode 100644
index 00000000..1f97af24
--- /dev/null
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Controller\CustomerAppAPI;
+
+use Symfony\Component\HttpFoundation\Request;
+use Catalyst\ApiBundle\Component\Response as ApiResponse;
+
+class SubscriptionController extends ApiController
+{
+    public function getRecurringFee(Request $req)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // response
+        return new ApiResponse(true, '', [
+            'amount' => $this->getParameter('subscription_recurring_fee'),
+        ]);
+    }
+}

From 96a7cc929e24a74792c12258352367fb196cf998 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 3 Aug 2024 06:31:35 +0800
Subject: [PATCH 08/27] Add email to customer info endpoint #799

---
 src/Controller/CustomerAppAPI/CustomerController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Controller/CustomerAppAPI/CustomerController.php b/src/Controller/CustomerAppAPI/CustomerController.php
index 4ba7279c..2abfe2e5 100644
--- a/src/Controller/CustomerAppAPI/CustomerController.php
+++ b/src/Controller/CustomerAppAPI/CustomerController.php
@@ -27,6 +27,7 @@ class CustomerController extends ApiController
             return new ApiResponse(true, '', [
                 'first_name' => '',
                 'last_name' => '',
+                'email' => '',
                 'priv_third_party' => (bool) false,
                 'priv_promo' => (bool) false,
             ]);
@@ -36,6 +37,7 @@ class CustomerController extends ApiController
         return new ApiResponse(true, '', [
             'first_name' => $cust->getFirstName(),
             'last_name' => $cust->getLastName(),
+            'email' => $cust->getEmail(),
             'priv_third_party' => (bool) $cust->getPrivacyThirdParty(),
             'priv_promo' => (bool) $cust->getPrivacyPromo(),
         ]);

From 219d5c09d31408d49cfb59c6cc57f27b1df58eff Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 10 Aug 2024 05:26:04 +0800
Subject: [PATCH 09/27] Add endpoint for subscription paymongo public key #799

---
 config/routes/apiv2.yaml                      |  5 +++
 config/services.yaml                          |  1 +
 .../CustomerAppAPI/SubscriptionController.php | 34 +++++++++++++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index 50c18fb8..1ceba391 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -324,4 +324,9 @@ apiv2_static_content:
 apiv2_subscription_fee:
     path: /apiv2/subscription/fee
     controller: App\Controller\CustomerAppAPI\SubscriptionController::getRecurringFee
+    methods: [GET]
+
+apiv2_subscription_paymongo_public_key:
+    path: /apiv2/subscription/ppk
+    controller: App\Controller\CustomerAppAPI\SubscriptionController::getPaymongoPublicKey
     methods: [GET]
\ No newline at end of file
diff --git a/config/services.yaml b/config/services.yaml
index 0430a9d6..093ecf2d 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -18,6 +18,7 @@ parameters:
     insurance_premiums_banner_url: "%env(INSURANCE_PREMIUMS_BANNER_URL)%"
     enabled_hub_filters: "%env(ENABLED_HUB_FILTERS)%"
     subscription_recurring_fee: "%env(SUBSCRIPTION_RECURRING_FEE)%"
+    subscription_paymongo_public_key: "%env(SUBSCRIPTION_PAYMONGO_PUBLIC_KEY)%"
 
 services:
     # default configuration for services in *this* file
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 1f97af24..b86b410d 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -5,9 +5,39 @@ namespace App\Controller\CustomerAppAPI;
 use Symfony\Component\HttpFoundation\Request;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
 
+use App\Entity\CustomerVehicle;
+
 class SubscriptionController extends ApiController
 {
-    public function getRecurringFee(Request $req)
+    public function getRecurringFee(Request $req, $cv_id)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get customer vehicle
+        $cv = $this->em->getRepository(CustomerVehicle::class)->find($cv_id);
+
+        // check if it exists
+        if ($cv == null) {
+            return new ApiResponse(false, 'Vehicle does not exist.');
+        }
+
+        // check if it's owned by customer
+        if ($cv->getCustomer()->getID() != $this->session->getCustomer()->getID()) {
+            return new ApiResponse(false, 'Invalid vehicle.');
+        }
+
+        // response
+        return new ApiResponse(true, '', [
+            'amount' => $this->getParameter('subscription_recurring_fee'),
+        ]);
+    }
+
+    public function getPayMongoPublicKey(Request $req)
     {
         // check requirements
         $validity = $this->validateRequest($req);
@@ -18,7 +48,7 @@ class SubscriptionController extends ApiController
 
         // response
         return new ApiResponse(true, '', [
-            'amount' => $this->getParameter('subscription_recurring_fee'),
+            'content' => $this->getParameter('subscription_paymongo_public_key'),
         ]);
     }
 }

From b67f9600559f3b0ac77784f328d7b7cf8c0142c7 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 10 Aug 2024 05:38:58 +0800
Subject: [PATCH 10/27] Add subscription MSRP field to battery sizes #799

---
 src/Controller/BatterySizeController.php |  3 ++-
 src/Entity/BatterySize.php               | 17 +++++++++++++++
 templates/battery-size/form.html.twig    | 27 ++++++++++++++++--------
 translations/messages.en.yaml            |  1 +
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/Controller/BatterySizeController.php b/src/Controller/BatterySizeController.php
index 177780e8..1f428a4d 100644
--- a/src/Controller/BatterySizeController.php
+++ b/src/Controller/BatterySizeController.php
@@ -130,7 +130,8 @@ class BatterySizeController extends Controller
             ->setTIPriceMotolite($req->request->get('tip_motolite'))
             ->setTIPricePremium($req->request->get('tip_premium'))
             ->setTIPriceOther($req->request->get('tip_other'))
-            ->setTIPriceLazada($req->request->get('tip_lazada'));
+            ->setTIPriceLazada($req->request->get('tip_lazada'))
+            ->setSubMSRP($req->request->get('sub_msrp'));
     }
 
     public function addSubmit(Request $req, ValidatorInterface $validator)
diff --git a/src/Entity/BatterySize.php b/src/Entity/BatterySize.php
index 8b47d6af..cd79067f 100644
--- a/src/Entity/BatterySize.php
+++ b/src/Entity/BatterySize.php
@@ -57,6 +57,12 @@ class BatterySize
      */
     protected $tip_lazada;
 
+    // subscription msrp
+    /**
+     * @ORM\Column(type="decimal", precision=7, scale=2, nullable=true)
+     */
+    protected $sub_msrp;
+
     public function __construct()
     {
         $this->batteries = new ArrayCollection();
@@ -64,6 +70,7 @@ class BatterySize
         $this->tip_premium = 0;
         $this->tip_other = 0;
         $this->tip_lazada = 0;
+        $this->sub_msrp = 0;
     }
 
     public function getID()
@@ -149,4 +156,14 @@ class BatterySize
         return $this->tip_lazada;
     }
 
+    public function setSubMSRP($sub_msrp)
+    {
+        $this->sub_msrp = $sub_msrp;
+        return $this;
+    }
+
+    public function getSubMSRP()
+    {
+        return $this->sub_msrp;
+    }
 }
diff --git a/templates/battery-size/form.html.twig b/templates/battery-size/form.html.twig
index 06d3fadd..44e52e3f 100644
--- a/templates/battery-size/form.html.twig
+++ b/templates/battery-size/form.html.twig
@@ -71,15 +71,24 @@
 									<div class="form-control-feedback hide" data-field="tip_other"></div>
 								</div>
 							</div>
-                                                        <div class="form-group m-form__group row no-border">
-                                                            <label class="col-lg-3 col-form-label" data-field="tip_lazada">
-                                                                {% trans %}battery_size_tradein_lazada{% endtrans %}
-                                                            </label>
-                                                            <div class="col-lg-9">
-                                                                <input type="text" name="tip_lazada" class="form-control m-input" value="{{ obj.getTIPriceLazada }}">
-                                                                <div class="form-control-feedback hide" data-field="tip_lazada"></div>
-                                                            </div>
-                                                        </div>	
+							<div class="form-group m-form__group row no-border">
+								<label class="col-lg-3 col-form-label" data-field="tip_lazada">
+									{% trans %}battery_size_tradein_lazada{% endtrans %}
+								</label>
+								<div class="col-lg-9">
+									<input type="text" name="tip_lazada" class="form-control m-input" value="{{ obj.getTIPriceLazada }}">
+									<div class="form-control-feedback hide" data-field="tip_lazada"></div>
+								</div>
+							</div>
+							<div class="form-group m-form__group row no-border">
+								<label class="col-lg-3 col-form-label" data-field="sub_msrp">
+									{% trans %}battery_Size_sub_msrp{% endtrans %}
+								</label>
+								<div class="col-lg-9">
+									<input type="text" name="sub_msrp" class="form-control m-input" value="{{ obj.getSubMSRP }}">
+									<div class="form-control-feedback hide" data-field="sub_msrp"></div>
+								</div>
+							</div>	
 			            </div>
 			            <div class="m-portlet__foot m-portlet__foot--fit">
 							<div class="m-form__actions m-form__actions--solid m-form__actions--right">
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 5fbc11a9..bb02c767 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -9,6 +9,7 @@ battery_size_tradein_brand: Trade-in Motolite
 battery_size_tradein_premium: Trade-in Premium
 battery_size_tradein_other: Trade-in Other
 battery_size_tradein_lazada: Trade-in Lazada
+battery_Size_sub_msrp: Subscription MSRP
 add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
 jo_title_pdf: Motolite Res-Q Job Order
 country_code_prefix: '+63'

From 4f5560f6f7472a757ed71c9a4611ddab1690b7f3 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 11 Aug 2024 15:05:20 +0800
Subject: [PATCH 11/27] Update subscription fee endpoint to be specific to each
 vehicle model #799

---
 config/routes/apiv2.yaml                      |  2 +-
 config/services.yaml                          |  1 -
 src/Controller/BatterySizeController.php      |  2 +-
 .../CustomerAppAPI/SubscriptionController.php | 24 +++++++++----------
 .../CustomerAppAPI/VehicleController.php      |  2 +-
 src/Entity/BatterySize.php                    | 12 +++++-----
 templates/battery-size/form.html.twig         |  8 +++----
 translations/messages.en.yaml                 |  2 +-
 8 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index 1ceba391..8fef53b4 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -322,7 +322,7 @@ apiv2_static_content:
 
 # subscription
 apiv2_subscription_fee:
-    path: /apiv2/subscription/fee
+    path: /apiv2/subscription/{vid}/fee
     controller: App\Controller\CustomerAppAPI\SubscriptionController::getRecurringFee
     methods: [GET]
 
diff --git a/config/services.yaml b/config/services.yaml
index 093ecf2d..6e24ee74 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -17,7 +17,6 @@ parameters:
     ios_app_version: "%env(IOS_APP_VERSION)%"
     insurance_premiums_banner_url: "%env(INSURANCE_PREMIUMS_BANNER_URL)%"
     enabled_hub_filters: "%env(ENABLED_HUB_FILTERS)%"
-    subscription_recurring_fee: "%env(SUBSCRIPTION_RECURRING_FEE)%"
     subscription_paymongo_public_key: "%env(SUBSCRIPTION_PAYMONGO_PUBLIC_KEY)%"
 
 services:
diff --git a/src/Controller/BatterySizeController.php b/src/Controller/BatterySizeController.php
index 1f428a4d..5af7730e 100644
--- a/src/Controller/BatterySizeController.php
+++ b/src/Controller/BatterySizeController.php
@@ -131,7 +131,7 @@ class BatterySizeController extends Controller
             ->setTIPricePremium($req->request->get('tip_premium'))
             ->setTIPriceOther($req->request->get('tip_other'))
             ->setTIPriceLazada($req->request->get('tip_lazada'))
-            ->setSubMSRP($req->request->get('sub_msrp'));
+            ->setSubRecurringFee($req->request->get('sub_recurring_fee'));
     }
 
     public function addSubmit(Request $req, ValidatorInterface $validator)
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index b86b410d..9ef275d1 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -5,11 +5,11 @@ namespace App\Controller\CustomerAppAPI;
 use Symfony\Component\HttpFoundation\Request;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
 
-use App\Entity\CustomerVehicle;
+use App\Entity\Vehicle;
 
 class SubscriptionController extends ApiController
 {
-    public function getRecurringFee(Request $req, $cv_id)
+    public function getRecurringFee(Request $req, $vid)
     {
         // check requirements
         $validity = $this->validateRequest($req);
@@ -18,22 +18,22 @@ class SubscriptionController extends ApiController
             return new ApiResponse(false, $validity['error']);
         }
 
-        // get customer vehicle
-        $cv = $this->em->getRepository(CustomerVehicle::class)->find($cv_id);
-
-        // check if it exists
-        if ($cv == null) {
-            return new ApiResponse(false, 'Vehicle does not exist.');
+        // get vehicle
+        $vehicle = $this->em->getRepository(Vehicle::class)->find($vid);
+        if ($vehicle == null) {
+            return new ApiResponse(false, 'Invalid vehicle.');
         }
 
-        // check if it's owned by customer
-        if ($cv->getCustomer()->getID() != $this->session->getCustomer()->getID()) {
-            return new ApiResponse(false, 'Invalid vehicle.');
+        // get compatible batteries
+        $batts = $vehicle->getActiveBatteries();
+
+        if (!empty($batts)) {
+            $fee = $batts[0]->getSize()->getSubRecurringFee() ?? 0;
         }
 
         // response
         return new ApiResponse(true, '', [
-            'amount' => $this->getParameter('subscription_recurring_fee'),
+            'amount' => $fee,
         ]);
     }
 
diff --git a/src/Controller/CustomerAppAPI/VehicleController.php b/src/Controller/CustomerAppAPI/VehicleController.php
index 0b5fdc57..c0ce272f 100644
--- a/src/Controller/CustomerAppAPI/VehicleController.php
+++ b/src/Controller/CustomerAppAPI/VehicleController.php
@@ -393,7 +393,7 @@ class VehicleController extends ApiController
         // TODO: possibly refactor this bit
         // if no valid previous JO is found, base the trade-in value on recommended batteries
         if (!$previous_jo_found) {
-            $comp_batteries = $cv->getVehicle()->getBatteries();
+            $comp_batteries = $cv->getVehicle()->getActiveBatteries();
             
             // get the lowest trade-in value from the list of batteries
             if (!empty($comp_batteries)) {
diff --git a/src/Entity/BatterySize.php b/src/Entity/BatterySize.php
index cd79067f..3d7112fc 100644
--- a/src/Entity/BatterySize.php
+++ b/src/Entity/BatterySize.php
@@ -61,7 +61,7 @@ class BatterySize
     /**
      * @ORM\Column(type="decimal", precision=7, scale=2, nullable=true)
      */
-    protected $sub_msrp;
+    protected $sub_recurring_fee;
 
     public function __construct()
     {
@@ -70,7 +70,7 @@ class BatterySize
         $this->tip_premium = 0;
         $this->tip_other = 0;
         $this->tip_lazada = 0;
-        $this->sub_msrp = 0;
+        $this->sub_recurring_fee = 0;
     }
 
     public function getID()
@@ -156,14 +156,14 @@ class BatterySize
         return $this->tip_lazada;
     }
 
-    public function setSubMSRP($sub_msrp)
+    public function setSubRecurringFee($sub_recurring_fee)
     {
-        $this->sub_msrp = $sub_msrp;
+        $this->sub_recurring_fee = $sub_recurring_fee;
         return $this;
     }
 
-    public function getSubMSRP()
+    public function getSubRecurringFee()
     {
-        return $this->sub_msrp;
+        return $this->sub_recurring_fee;
     }
 }
diff --git a/templates/battery-size/form.html.twig b/templates/battery-size/form.html.twig
index 44e52e3f..2138c5ab 100644
--- a/templates/battery-size/form.html.twig
+++ b/templates/battery-size/form.html.twig
@@ -81,12 +81,12 @@
 								</div>
 							</div>
 							<div class="form-group m-form__group row no-border">
-								<label class="col-lg-3 col-form-label" data-field="sub_msrp">
-									{% trans %}battery_Size_sub_msrp{% endtrans %}
+								<label class="col-lg-3 col-form-label" data-field="sub_recurring_fee">
+									{% trans %}battery_Size_sub_recurring_fee{% endtrans %}
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="sub_msrp" class="form-control m-input" value="{{ obj.getSubMSRP }}">
-									<div class="form-control-feedback hide" data-field="sub_msrp"></div>
+									<input type="text" name="sub_recurring_fee" class="form-control m-input" value="{{ obj.getSubRecurringFee }}">
+									<div class="form-control-feedback hide" data-field="sub_recurring_fee"></div>
 								</div>
 							</div>	
 			            </div>
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index bb02c767..6fde186c 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -9,7 +9,7 @@ battery_size_tradein_brand: Trade-in Motolite
 battery_size_tradein_premium: Trade-in Premium
 battery_size_tradein_other: Trade-in Other
 battery_size_tradein_lazada: Trade-in Lazada
-battery_Size_sub_msrp: Subscription MSRP
+battery_Size_sub_recurring_fee: Subscription Recurring Fee
 add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
 jo_title_pdf: Motolite Res-Q Job Order
 country_code_prefix: '+63'

From e3649c3d2d18f8f1d08725cce772e7ec94368d3d Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 11 Aug 2024 15:26:48 +0800
Subject: [PATCH 12/27] Fix URL format of subscription fee endpoint #799

---
 config/routes/apiv2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index 8fef53b4..ae9e6404 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -322,7 +322,7 @@ apiv2_static_content:
 
 # subscription
 apiv2_subscription_fee:
-    path: /apiv2/subscription/{vid}/fee
+    path: /apiv2/subscription/fee/{vid}
     controller: App\Controller\CustomerAppAPI\SubscriptionController::getRecurringFee
     methods: [GET]
 

From debb399e96d5e273dd15a51b3b077871ee03a6bd Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 12 Aug 2024 05:09:58 +0800
Subject: [PATCH 13/27] Add support for handling multiple paymongo accounts
 #799

---
 config/services.yaml                          |  8 ++++---
 ...ProcessLatePaymongoTransactionsCommand.php | 11 ++++++---
 .../CustomerAppAPI/CustomerController.php     | 24 ++++++++++++-------
 .../CustomerAppAPI/InsuranceController.php    |  9 ++++++-
 .../CustomerAppAPI/SubscriptionController.php |  3 ++-
 .../CustomerAppAPI/VehicleController.php      | 17 +++++++++----
 src/Service/PayMongoConnector.php             |  6 ++++-
 7 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/config/services.yaml b/config/services.yaml
index 6e24ee74..f2db62c5 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -17,7 +17,12 @@ parameters:
     ios_app_version: "%env(IOS_APP_VERSION)%"
     insurance_premiums_banner_url: "%env(INSURANCE_PREMIUMS_BANNER_URL)%"
     enabled_hub_filters: "%env(ENABLED_HUB_FILTERS)%"
+    insurance_paymongo_public_key: "%env(INSURANCE_PAYMONGO_PUBLIC_KEY)%"
+    insurance_paymongo_secret_key: "%env(INSURANCE_PAYMONGO_SECRET_KEY)%"
+    insurance_paymongo_webhook_id: "%env(INSURANCE_PAYMONGO_WEBHOOK_ID)%"
     subscription_paymongo_public_key: "%env(SUBSCRIPTION_PAYMONGO_PUBLIC_KEY)%"
+    subscription_paymongo_secret_key: "%env(SUBSCRIPTION_PAYMONGO_SECRET_KEY)%"
+    subscription_paymongo_webhook_id: "%env(SUBSCRIPTION_PAYMONGO_WEBHOOK_ID)%"
 
 services:
     # default configuration for services in *this* file
@@ -115,7 +120,6 @@ services:
         arguments:
             $em: "@doctrine.orm.entity_manager"
             $paymongo: "@App\\Service\\PayMongoConnector"
-            $webhook_id: "%env(PAYMONGO_WEBHOOK_ID)%"
 
     # rider tracker service
     App\Service\RiderTracker:
@@ -239,8 +243,6 @@ services:
     App\Service\PayMongoConnector:
         arguments:
             $base_url: "%env(PAYMONGO_BASE_URL)%"
-            $public_key: "%env(PAYMONGO_PUBLIC_KEY)%"
-            $secret_key: "%env(PAYMONGO_SECRET_KEY)%"
 
     # entity listener for customer vehicle warranty code history
     App\EntityListener\CustomerVehicleSerialListener:
diff --git a/src/Command/ProcessLatePaymongoTransactionsCommand.php b/src/Command/ProcessLatePaymongoTransactionsCommand.php
index 8bdc66ca..50e3dc58 100644
--- a/src/Command/ProcessLatePaymongoTransactionsCommand.php
+++ b/src/Command/ProcessLatePaymongoTransactionsCommand.php
@@ -6,6 +6,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -19,14 +20,18 @@ class ProcessLatePaymongoTransactionsCommand extends Command
 {
     protected $em;
     protected $paymongo;
-
     protected $webhook_id;
 
-    public function __construct(EntityManagerInterface $em, PayMongoConnector $paymongo, $webhook_id)
+    public function __construct(EntityManagerInterface $em, PayMongoConnector $paymongo, ParameterBagInterface $params)
     {
         $this->em = $em;
+        $this->webhook_id = $params->get('insurance_paymongo_webhook_id');
+
         $this->paymongo = $paymongo;
-        $this->webhook_id = $webhook_id;
+        $this->paymongo->initialize(
+            $params->get('insurance_paymongo_public_key'),
+            $params->get('insurance_paymongo_secret_key')
+        );
 
         parent::__construct();
     }
diff --git a/src/Controller/CustomerAppAPI/CustomerController.php b/src/Controller/CustomerAppAPI/CustomerController.php
index 2abfe2e5..6ce9259f 100644
--- a/src/Controller/CustomerAppAPI/CustomerController.php
+++ b/src/Controller/CustomerAppAPI/CustomerController.php
@@ -46,10 +46,7 @@ class CustomerController extends ApiController
     public function updateInfo(Request $req)
     {
         // validate params
-        $validity = $this->validateRequest($req, [
-            'first_name',
-            'last_name',
-        ]);
+        $validity = $this->validateRequest($req);
 
         if (!$validity['is_valid']) {
             return new ApiResponse(false, $validity['error']);
@@ -129,10 +126,21 @@ class CustomerController extends ApiController
             $this->session->setCustomer($cust);
         }
 
-        $cust->setFirstName($req->request->get('first_name'))
-            ->setLastName($req->request->get('last_name'))
-            ->setEmail($req->request->get('email', ''))
-            ->setConfirmed($this->session->isConfirmed());
+        if (!is_null($req->request->get('first_name'))) {
+            $cust->setFirstName($req->request->get('first_name'));
+        }
+
+        if (!is_null($req->request->get('last_name'))) {
+            $cust->setLastName($req->request->get('last_name'));
+        }
+
+        if (!is_null($req->request->get('email'))) {
+            $cust->setEmail($req->request->get('email'));
+        }
+
+        if (!is_null($this->session->isConfirmed())) {
+            $cust->setConfirmed($this->session->isConfirmed());
+        }
 
         // if customer user isn't set, set it now
         if ($cust->getCustomerUser() == null) {
diff --git a/src/Controller/CustomerAppAPI/InsuranceController.php b/src/Controller/CustomerAppAPI/InsuranceController.php
index 271ebdb8..0916d8fa 100644
--- a/src/Controller/CustomerAppAPI/InsuranceController.php
+++ b/src/Controller/CustomerAppAPI/InsuranceController.php
@@ -3,6 +3,7 @@
 namespace App\Controller\CustomerAppAPI;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
@@ -33,7 +34,7 @@ class InsuranceController extends ApiController
         $this->client = $client;
     }
 
-    public function createApplication(Request $req, PayMongoConnector $paymongo, UrlGeneratorInterface $router)
+    public function createApplication(Request $req, PayMongoConnector $paymongo, UrlGeneratorInterface $router, ParameterBagInterface $params)
     {
         // validate params
         $validity = $this->validateRequest($req, [
@@ -162,6 +163,12 @@ class InsuranceController extends ApiController
         $this->em->persist($gt);
         $this->em->flush();
 
+        // initialize paymongo connector
+        $paymongo->initialize(
+            $params->get('insurance_paymongo_public_key'),
+            $params->get('insurance_paymongo_secret_key')
+        );
+
         // create paymongo checkout resource
         $checkout = $paymongo->createCheckout(
             $cust,
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 9ef275d1..45df060c 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -28,7 +28,8 @@ class SubscriptionController extends ApiController
         $batts = $vehicle->getActiveBatteries();
 
         if (!empty($batts)) {
-            $fee = $batts[0]->getSize()->getSubRecurringFee() ?? 0;
+            $size_fee_raw = $batts[0]->getSize()->getSubRecurringFee();
+            $fee = $size_fee_raw ? bcmul($size_fee_raw, 100) : 0;
         }
 
         // response
diff --git a/src/Controller/CustomerAppAPI/VehicleController.php b/src/Controller/CustomerAppAPI/VehicleController.php
index c0ce272f..0ca16872 100644
--- a/src/Controller/CustomerAppAPI/VehicleController.php
+++ b/src/Controller/CustomerAppAPI/VehicleController.php
@@ -3,6 +3,7 @@
 namespace App\Controller\CustomerAppAPI;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
 use CrEOF\Spatial\PHP\Types\Geometry\Point;
 
@@ -115,7 +116,7 @@ class VehicleController extends ApiController
 
     }
 
-    public function getVehicle(Request $req, $id, PayMongoConnector $paymongo)
+    public function getVehicle(Request $req, $id, PayMongoConnector $paymongo, ParameterBagInterface $params)
     {
         // check requirements
         $validity = $this->validateRequest($req);
@@ -139,7 +140,7 @@ class VehicleController extends ApiController
 
         // response
         return new ApiResponse(true, '', [
-            'vehicle' => $this->generateVehicleInfo($cv, true, true, $paymongo),
+            'vehicle' => $this->generateVehicleInfo($cv, true, true, $paymongo, $params),
         ]);
     }
 
@@ -210,7 +211,7 @@ class VehicleController extends ApiController
         ]);
     }
 
-    public function listVehicles(Request $req, PayMongoConnector $paymongo)
+    public function listVehicles(Request $req, PayMongoConnector $paymongo, ParameterBagInterface $params)
     {
         // validate params
         $validity = $this->validateRequest($req);
@@ -231,7 +232,7 @@ class VehicleController extends ApiController
         // only get the customer's vehicles whose flag_active is true
         $cvs = $this->em->getRepository(CustomerVehicle::class)->findBy(['flag_active' => true, 'customer' => $cust]);
         foreach ($cvs as $cv) {
-            $cv_list[] = $this->generateVehicleInfo($cv, true, true, $paymongo);
+            $cv_list[] = $this->generateVehicleInfo($cv, true, true, $paymongo, $params);
         }
 
         // response
@@ -417,7 +418,7 @@ class VehicleController extends ApiController
         ];
     }
 
-    protected function generateVehicleInfo(CustomerVehicle $cv, $include_insurance = false, $include_active_sub = false, PayMongoConnector $paymongo)
+    protected function generateVehicleInfo(CustomerVehicle $cv, $include_insurance = false, $include_active_sub = false, PayMongoConnector $paymongo, ParameterBagInterface $params)
     {
         $battery_id = null;
         if ($cv->getCurrentBattery() != null)
@@ -469,6 +470,12 @@ class VehicleController extends ApiController
                 // TODO: maybe handle this more elegantly. issue is not sure it is a good idea to update the db for this very transient status as the webhook listener also updates this status right away
                 switch ($status) {
                     case InsuranceApplicationStatus::CREATED:
+                        // initialize paymongo connector
+                        $paymongo->initialize(
+                            $params->get('insurance_paymongo_public_key'),
+                            $params->get('insurance_paymongo_secret_key')
+                        );
+
                         // get latest status on this checkout from paymongo
                         $checkout = $paymongo->getCheckout($gt->getExtTransactionId());
 
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index 3abafc22..61413501 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -15,9 +15,13 @@ class PayMongoConnector
     protected $secret_key;
     protected $hash;
 
-    public function __construct($base_url, $public_key, $secret_key)
+    public function __construct($base_url)
     {
         $this->base_url = $base_url;
+    }
+
+    public function initialize($public_key, $secret_key)
+    {
         $this->public_key = $public_key;
         $this->secret_key = $secret_key;
         $this->hash = $this->generateHash();

From 5a2f57492db62d2385968c1d6d677cef65575932 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 12 Aug 2024 06:50:01 +0800
Subject: [PATCH 14/27] Tie battery sizes to subscription plans #799

---
 src/Controller/BatterySizeController.php |  19 +++
 src/Service/PayMongoConnector.php        | 156 ++++++++++++++++++++++-
 2 files changed, 171 insertions(+), 4 deletions(-)

diff --git a/src/Controller/BatterySizeController.php b/src/Controller/BatterySizeController.php
index 5af7730e..0ffb3444 100644
--- a/src/Controller/BatterySizeController.php
+++ b/src/Controller/BatterySizeController.php
@@ -9,11 +9,24 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use App\Service\PayMongoConnector;
 
 use Catalyst\MenuBundle\Annotation\Menu;
 
 class BatterySizeController extends Controller
 {
+    protected $pm;
+
+    public function __construct(PayMongoConnector $pm, ParameterBagInterface $params)
+    {
+        $this->pm = $pm;
+        $this->pm->initialize(
+            $params->get('subscription_paymongo_public_key'),
+            $params->get('subscription_paymongo_secret_key'),
+        );
+    }
+
     /**
      * @Menu(selected="bsize_list")
      */
@@ -168,6 +181,9 @@ class BatterySizeController extends Controller
             $em->persist($row);
             $em->flush();
 
+            // create new paymongo subscription plan
+            $this->pm->createOrUpdateSubPlan($row);
+
             // return successful response
             return $this->json([
                 'success' => 'Changes have been saved!'
@@ -235,6 +251,9 @@ class BatterySizeController extends Controller
             // validated! save the entity
             $em->flush();
 
+            // find if paymongo subscription plan exists, then update accordingly
+            $this->pm->createOrUpdateSubPlan($row);
+
             // return successful response
             return $this->json([
                 'success' => 'Changes have been saved!'
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index 61413501..5b4c4b9f 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -7,6 +7,7 @@ use GuzzleHttp\Psr7;
 use GuzzleHttp\Exception\RequestException;
 
 use App\Entity\Customer;
+use App\Entity\BatterySize;
 
 class PayMongoConnector
 {
@@ -88,6 +89,150 @@ class PayMongoConnector
         return $this->doRequest('/v1/webhooks/' . $id . '/enable', 'POST');
     }
 
+    public function getPlans()
+    {
+        return $this->doRequest('/v1/subscriptions/plans', 'GET');
+    }
+
+    public function createPlan($plan_data)
+    {
+        $body = [
+            'data' => [
+                'attributes' => [
+                    'amount' => (int)$plan_data['amount'],
+                    'currency' => 'PHP',
+                    'description' => $plan_data['description'],
+                    'interval' => $plan_data['interval'],
+                    'interval_count' => $plan_data['interval_count'],
+                    'name' => $plan_data['name'],
+                    'metadata' => $plan_data['metadata'],
+                ],
+            ],
+        ];
+
+        return $this->doRequest('/v1/subscriptions/plans', 'POST', $body);
+    }
+
+    public function updatePlan($plan_id, $plan_data)
+    {
+        $body = [
+            'data' => [
+                'attributes' => [
+                    'amount' => (int)$plan_data['amount'],
+                ],
+            ],
+        ];
+
+        return $this->doRequest('/v1/subscriptions/plans/' . $plan_id, 'PUT', $body);
+    }
+
+    public function createOrUpdateSubPlan(BatterySize $bsize)
+    {
+        // get all plans
+        $plans = $this->getPlans();
+
+        // find the plan with the matching substring (battery size name)
+        $found_plan = null;
+
+        if ($plans['success'] && !empty($plans['response']['data'])) {
+            foreach ($plans['response']['data'] as $plan) {
+                $plan_bsize_id = $plan['attributes']['metadata']['battery_size_id'] ?? null;
+
+                if (!empty($plan_bsize_id)) {
+                    $found_plan = $plan;
+                    break;
+                }
+            }
+        }
+
+        if (!empty($found_plan)) {
+            // update existing plan
+            $result = $this->updatePlan($found_plan['id'], [
+                'amount' => bcmul($bsize->getSubRecurringFee(), 100),
+            ]);
+        } else {
+            // create new plan
+            $result = $this->createPlan([
+                'name' => "RESQ Subscription",
+                'amount' => bcmul($bsize->getSubRecurringFee(), 100),
+                'description' => "Motolite Battery Subscription Plan",
+                'interval' => 'monthly',
+                'interval_count' => 1,
+                'metadata' => [
+                    'battery_size_id' => (string)$bsize->getID(),
+                ],
+            ]);
+        }
+
+        return $result;
+    }
+
+    public function findCustomer($email)
+    {
+        return $this->doRequest('/v1/customers?email=' . $email, 'GET');
+    }
+
+    public function createCustomer(Customer $cust)
+    {
+        $body = [
+            'data' => [
+                'attributes' => [
+                    'first_name' => $cust->getFirstName(),
+                    'last_name' => $cust->getLastName(),
+                    'phone' => $cust->getPhoneMobile(),
+                    'email' => $cust->getEmail(),
+                    'default_device' => 'email',
+                ],
+            ],
+        ];
+
+        return $this->doRequest('/v1/customers', 'POST', $body);
+    }
+
+    public function updateCustomer(Customer $cust, $ext_cust_id)
+    {
+        $body = [
+            'data' => [
+                'attributes' => [
+                    'first_name' => $cust->getFirstName(),
+                    'last_name' => $cust->getLastName(),
+                    'phone' => $cust->getPhoneMobile(),
+                    'email' => $cust->getEmail(),
+                ],
+            ],
+        ];
+
+        return $this->doRequest('/v1/customers/' . $ext_cust_id, 'PUT', $body);
+    }
+        
+
+    public function createSubscription($ext_cust_id, $plan_id)
+    {
+        $body = [
+            'data' => [
+                'attributes' => [
+                    'customer_id' => $ext_cust_id,
+                    'plan_id' => $plan_id,
+                ],
+            ],
+        ];
+
+        return $this->doRequest('/v1/subscriptions', 'POST', $body);
+    }
+
+    public function attachPaymentIntent($pm_id, $pi_id)
+    {
+        $body = [
+            'data' => [
+                'attributes' => [
+                    'payment_method' => $pm_id,
+                ],
+            ],
+        ];
+
+        return $this->doRequest('/v1/payment_intents/' . $pi_id . '/attach', 'POST', $body);
+    }
+
     protected function generateHash()
     {
         return base64_encode($this->secret_key);
@@ -102,11 +247,14 @@ class PayMongoConnector
             'authorization' => 'Basic '. $this->hash,
         ];
 
+        $request_params = ['headers' => $headers];
+
+        if (!empty($request_body)) {
+            $request_params['json'] = $request_body;
+        }
+
         try {
-            $response = $client->request($method, $this->base_url . '/' . $url, [
-                'json' => $request_body,
-                'headers' => $headers,
-            ]);
+            $response = $client->request($method, $this->base_url . $url, $request_params);
         } catch (RequestException $e) {
             $error = ['message' => $e->getMessage()];
 

From b3548fcc50646f43321069bd706519d1cee92847 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 12 Aug 2024 06:52:13 +0800
Subject: [PATCH 15/27] Add null check for subscription fee on paymongo
 connector #799

---
 src/Service/PayMongoConnector.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index 5b4c4b9f..92eda90d 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -99,7 +99,7 @@ class PayMongoConnector
         $body = [
             'data' => [
                 'attributes' => [
-                    'amount' => (int)$plan_data['amount'],
+                    'amount' => $plan_data['amount'],
                     'currency' => 'PHP',
                     'description' => $plan_data['description'],
                     'interval' => $plan_data['interval'],
@@ -118,7 +118,7 @@ class PayMongoConnector
         $body = [
             'data' => [
                 'attributes' => [
-                    'amount' => (int)$plan_data['amount'],
+                    'amount' => $plan_data['amount'],
                 ],
             ],
         ];
@@ -154,7 +154,7 @@ class PayMongoConnector
             // create new plan
             $result = $this->createPlan([
                 'name' => "RESQ Subscription",
-                'amount' => bcmul($bsize->getSubRecurringFee(), 100),
+                'amount' => (int)bcmul($bsize->getSubRecurringFee() ?? 0, 100),
                 'description' => "Motolite Battery Subscription Plan",
                 'interval' => 'monthly',
                 'interval_count' => 1,

From 7af20f3d69c3eea9d6609b3a25cd59788c818b70 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 12 Aug 2024 16:30:49 +0800
Subject: [PATCH 16/27] Replace sub fee endpoint with complete plan details
 #799

---
 config/routes/apiv2.yaml                      |  6 +--
 .../CustomerAppAPI/SubscriptionController.php | 16 ++++++--
 src/Service/PayMongoConnector.php             | 41 +++++++++++--------
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index ae9e6404..6702a5a2 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -321,9 +321,9 @@ apiv2_static_content:
     methods: [GET]
 
 # subscription
-apiv2_subscription_fee:
-    path: /apiv2/subscription/fee/{vid}
-    controller: App\Controller\CustomerAppAPI\SubscriptionController::getRecurringFee
+apiv2_subscription_plan_details:
+    path: /apiv2/subscription/vehicle/{vid}/plan
+    controller: App\Controller\CustomerAppAPI\SubscriptionController::getPlanDetails
     methods: [GET]
 
 apiv2_subscription_paymongo_public_key:
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 45df060c..cda8f0e0 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -4,12 +4,13 @@ namespace App\Controller\CustomerAppAPI;
 
 use Symfony\Component\HttpFoundation\Request;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
+use App\Service\PayMongoConnector;
 
 use App\Entity\Vehicle;
 
 class SubscriptionController extends ApiController
 {
-    public function getRecurringFee(Request $req, $vid)
+    public function getPlanDetails(Request $req, $vid, PayMongoConnector $pm)
     {
         // check requirements
         $validity = $this->validateRequest($req);
@@ -24,17 +25,24 @@ class SubscriptionController extends ApiController
             return new ApiResponse(false, 'Invalid vehicle.');
         }
 
+        $plan = null;
+
         // get compatible batteries
         $batts = $vehicle->getActiveBatteries();
 
         if (!empty($batts)) {
-            $size_fee_raw = $batts[0]->getSize()->getSubRecurringFee();
-            $fee = $size_fee_raw ? bcmul($size_fee_raw, 100) : 0;
+            // initialize paymongo
+            $pm->initialize(
+                $this->getParameter('subscription_paymongo_public_key'),
+                $this->getParameter('subscription_paymongo_secret_key'),
+            );
+
+            $plan = $pm->getPlanByBatterySize($batts[0]->getSize());
         }
 
         // response
         return new ApiResponse(true, '', [
-            'amount' => $fee,
+            'plan' => $plan,
         ]);
     }
 
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index 92eda90d..68ff17ba 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -94,6 +94,28 @@ class PayMongoConnector
         return $this->doRequest('/v1/subscriptions/plans', 'GET');
     }
 
+    public function getPlanByBatterySize(BatterySize $bsize)
+    {
+        // get all plans
+        $plans = $this->getPlans();
+
+        // find the plan with the matching metadata for plan ID
+        $found_plan = null;
+
+        if ($plans['success'] && !empty($plans['response']['data'])) {
+            foreach ($plans['response']['data'] as $plan) {
+                $plan_bsize_id = $plan['attributes']['metadata']['battery_size_id'] ?? null;
+
+                if ($plan_bsize_id == $bsize->getID()) {
+                    $found_plan = $plan;
+                    break;
+                }
+            }
+        }
+
+        return $found_plan;
+    }
+
     public function createPlan($plan_data)
     {
         $body = [
@@ -128,27 +150,12 @@ class PayMongoConnector
 
     public function createOrUpdateSubPlan(BatterySize $bsize)
     {
-        // get all plans
-        $plans = $this->getPlans();
-
-        // find the plan with the matching substring (battery size name)
-        $found_plan = null;
-
-        if ($plans['success'] && !empty($plans['response']['data'])) {
-            foreach ($plans['response']['data'] as $plan) {
-                $plan_bsize_id = $plan['attributes']['metadata']['battery_size_id'] ?? null;
-
-                if (!empty($plan_bsize_id)) {
-                    $found_plan = $plan;
-                    break;
-                }
-            }
-        }
+        $found_plan = $this->getPlanByBatterySize($bsize);
 
         if (!empty($found_plan)) {
             // update existing plan
             $result = $this->updatePlan($found_plan['id'], [
-                'amount' => bcmul($bsize->getSubRecurringFee(), 100),
+                'amount' => (int)bcmul($bsize->getSubRecurringFee(), 100),
             ]);
         } else {
             // create new plan

From 919b56688d9057d0bb77ea8de37500ae2651d1b6 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Tue, 13 Aug 2024 05:45:46 +0800
Subject: [PATCH 17/27] Add endpoint for creating subscriptions, sync updating
 of customers with paymongo API if record exists #799

---
 config/routes/apiv2.yaml                      |  7 ++-
 .../CustomerAppAPI/ApiController.php          |  9 ++++
 .../CustomerAppAPI/CustomerController.php     |  9 +++-
 .../CustomerAppAPI/SubscriptionController.php | 46 ++++++++++++++--
 .../CustomerHandler/ResqCustomerHandler.php   | 16 +++++-
 src/Service/PayMongoConnector.php             | 54 ++++++++++++++++++-
 6 files changed, 130 insertions(+), 11 deletions(-)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index 6702a5a2..a7332516 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -329,4 +329,9 @@ apiv2_subscription_plan_details:
 apiv2_subscription_paymongo_public_key:
     path: /apiv2/subscription/ppk
     controller: App\Controller\CustomerAppAPI\SubscriptionController::getPaymongoPublicKey
-    methods: [GET]
\ No newline at end of file
+    methods: [GET]
+
+apiv2_subscription_create:
+    path: /apiv2/subscription
+    controller: App\Controller\CustomerAppAPI\SubscriptionController::createSubscription
+    methods: [POST]
diff --git a/src/Controller/CustomerAppAPI/ApiController.php b/src/Controller/CustomerAppAPI/ApiController.php
index fdc0ec59..577a05a6 100644
--- a/src/Controller/CustomerAppAPI/ApiController.php
+++ b/src/Controller/CustomerAppAPI/ApiController.php
@@ -13,6 +13,7 @@ use App\Ramcar\JOStatus;
 use App\Entity\Warranty;
 use App\Entity\JobOrder;
 use App\Entity\CustomerSession;
+use App\Service\PayMongoConnector;
 
 class ApiController extends BaseApiController
 {
@@ -164,4 +165,12 @@ class ApiController extends BaseApiController
     {
         return 'Our services are currently limited to some areas in Metro Manila, Baguio, Batangas, Laguna, Cavite, Pampanga, and Palawan. We will update you as soon as we are available in your area. Thank you for understanding. Keep safe!';
     }
+
+    protected function initializeSubscriptionPayMongoConnector(PayMongoConnector &$pm)
+    {
+        $pm->initialize(
+            $this->getParameter('subscription_paymongo_public_key'),
+            $this->getParameter('subscription_paymongo_secret_key'),
+        );
+    }
 }
diff --git a/src/Controller/CustomerAppAPI/CustomerController.php b/src/Controller/CustomerAppAPI/CustomerController.php
index 6ce9259f..c8cc9e53 100644
--- a/src/Controller/CustomerAppAPI/CustomerController.php
+++ b/src/Controller/CustomerAppAPI/CustomerController.php
@@ -9,6 +9,7 @@ use App\Ramcar\CustomerSource;
 use App\Entity\Customer;
 use App\Entity\PrivacyPolicy;
 use App\Service\HashGenerator;
+use App\Service\PayMongoConnector;
 
 class CustomerController extends ApiController
 {
@@ -43,7 +44,7 @@ class CustomerController extends ApiController
         ]);
     }
 
-    public function updateInfo(Request $req)
+    public function updateInfo(Request $req, PayMongoConnector $pm)
     {
         // validate params
         $validity = $this->validateRequest($req);
@@ -64,6 +65,12 @@ class CustomerController extends ApiController
 
         $this->em->flush();
 
+        // initialize paymongo connector
+        $this->initializeSubscriptionPayMongoConnector($pm);
+
+        // update customer paymongo record if exists
+        $pm->updateCustomerIfExists($cust);
+
         // response
         return new ApiResponse();
     }
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index cda8f0e0..3c3b24d1 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -31,11 +31,8 @@ class SubscriptionController extends ApiController
         $batts = $vehicle->getActiveBatteries();
 
         if (!empty($batts)) {
-            // initialize paymongo
-            $pm->initialize(
-                $this->getParameter('subscription_paymongo_public_key'),
-                $this->getParameter('subscription_paymongo_secret_key'),
-            );
+            // initialize paymongo connector
+            $this->initializeSubscriptionPayMongoConnector($pm);
 
             $plan = $pm->getPlanByBatterySize($batts[0]->getSize());
         }
@@ -60,4 +57,43 @@ class SubscriptionController extends ApiController
             'content' => $this->getParameter('subscription_paymongo_public_key'),
         ]);
     }
+
+    public function createSubscription(Request $req, PayMongoConnector $pm)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req, [
+            'plan_id',
+        ]);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get customer
+        $cust = $this->session->getCustomer();
+        if ($cust == null) {
+            return new ApiResponse(false, 'No customer information found.');
+        }
+
+        // initialize paymongo connector
+        $this->initializeSubscriptionPayMongoConnector($pm);
+
+        // get paymongo customer 
+        $pm_cust = $pm->findOrCreateCustomer($cust);
+        if (empty($pm_cust)) {
+            return new ApiResponse(false, 'Error retrieving customer record. Please try again later.');
+        }
+
+        // create subscription
+        // NOTE: for now we save ourselves the extra API call and assume the plan_id is valid since this won't change often anyway
+        $pm_sub = $pm->createSubscription($pm_cust['id'], $req->request->get('plan_id'));
+        if (!isset($pm_sub['data']['id'])) {
+            return new ApiResponse(false, 'Error creating subscription. Please try again later.');
+        }
+
+        // response
+        return new ApiResponse(true, '', [
+            'subscription_id' => $pm_sub['data']['id'],
+        ]);
+    }
 }
diff --git a/src/Service/CustomerHandler/ResqCustomerHandler.php b/src/Service/CustomerHandler/ResqCustomerHandler.php
index f8685801..2f947cee 100644
--- a/src/Service/CustomerHandler/ResqCustomerHandler.php
+++ b/src/Service/CustomerHandler/ResqCustomerHandler.php
@@ -4,6 +4,7 @@ namespace App\Service\CustomerHandler;
 
 use Doctrine\ORM\EntityManagerInterface;
 
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -24,7 +25,7 @@ use App\Entity\Battery;
 use App\Entity\VehicleManufacturer;
 use App\Entity\BatteryManufacturer;
 use App\Entity\CustomerTag;
-
+use App\Service\PayMongoConnector;
 use DateTime;
 
 class ResqCustomerHandler implements CustomerHandlerInterface
@@ -34,14 +35,22 @@ class ResqCustomerHandler implements CustomerHandlerInterface
     protected $country_code;
     protected $security;
     protected $template_hash;
+    protected $pm;
 
     public function __construct(EntityManagerInterface $em, ValidatorInterface $validator,
-                                string $country_code, Security $security)
+                                string $country_code, Security $security, PayMongoConnector $pm, ParameterBagInterface $params)
     {
         $this->em = $em;
         $this->validator = $validator;
         $this->country_code = $country_code;
         $this->security = $security;
+        $this->pm = $pm;
+
+        // initialize paymongo connector
+        $this->pm->initialize(
+            $params->get('subscription_paymongo_public_key'),
+            $params->get('subscription_paymongo_secret_key'),
+        );
 
         $this->loadTemplates();
     }
@@ -391,6 +400,9 @@ class ResqCustomerHandler implements CustomerHandlerInterface
             $em->persist($cust);
             $em->flush();
 
+            // update customer paymongo record if exists
+            $this->pm->updateCustomerIfExists($cust);
+
             $result = [
                 'id' => $cust->getID(),
             ];
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index 68ff17ba..b39d0fb2 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -174,7 +174,7 @@ class PayMongoConnector
         return $result;
     }
 
-    public function findCustomer($email)
+    public function findCustomerByEmail($email)
     {
         return $this->doRequest('/v1/customers?email=' . $email, 'GET');
     }
@@ -211,7 +211,57 @@ class PayMongoConnector
 
         return $this->doRequest('/v1/customers/' . $ext_cust_id, 'PUT', $body);
     }
-        
+     
+    public function updateCustomerIfExists(Customer $cust)
+    {
+        $email = $cust->getEmail();
+
+        // if no email, then we don't need to update
+        if (empty($email)) {
+            return false;
+        }
+
+        // check if we have an existing paymongo customer with this email
+        $found_cust = $this->findCustomerByEmail($email);
+
+        if (isset($found_cust['data']['id'])) {
+            // update existing customer record
+            return $this->updateCustomer($cust, $found_cust['data']);
+        }
+
+        return false;
+    }
+
+    public function findOrCreateCustomer(Customer $cust)
+    {
+        $email = $cust->getEmail();
+
+        // if no email, then we don't need to update
+        if (empty($email)) {
+            return false;
+        }
+
+        // check if we have an existing paymongo customer with this email
+        $found_cust = $this->findCustomerByEmail($email);
+
+        $pm_cust = null;
+
+        if (isset($found_cust['data']['id'])) {
+            // we found a customer record
+            $pm_cust = $found_cust['data'];
+        } else {
+            // we create a new customer record
+            $new_cust = $this->createCustomer($cust);
+
+            if (isset($new_cust['data']['id'])) {
+                // customer record was created successfully
+                $pm_cust = $new_cust['data'];
+            }
+        }
+
+        // NOTE: if $pm_cust is null at this point, an error occurred during customer creation and we check the request logs for more details
+        return $pm_cust;
+    }
 
     public function createSubscription($ext_cust_id, $plan_id)
     {

From 0d9da221a7f50563674179b4a28b444345d55a61 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Wed, 21 Aug 2024 01:16:43 +0800
Subject: [PATCH 18/27] Fix expected format from paymongo subscription
 endpoints #799

---
 config/routes/apiv2.yaml                              |  8 ++++----
 .../CustomerAppAPI/SubscriptionController.php         | 10 +++++++---
 src/Service/PayMongoConnector.php                     | 11 ++++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index a7332516..bb534de1 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -326,10 +326,10 @@ apiv2_subscription_plan_details:
     controller: App\Controller\CustomerAppAPI\SubscriptionController::getPlanDetails
     methods: [GET]
 
-apiv2_subscription_paymongo_public_key:
-    path: /apiv2/subscription/ppk
-    controller: App\Controller\CustomerAppAPI\SubscriptionController::getPaymongoPublicKey
-    methods: [GET]
+#apiv2_subscription_paymongo_public_key:
+#    path: /apiv2/subscription/ppk
+#    controller: App\Controller\CustomerAppAPI\SubscriptionController::getPaymongoPublicKey
+#    methods: [GET]
 
 apiv2_subscription_create:
     path: /apiv2/subscription
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 3c3b24d1..33ac8792 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -43,6 +43,8 @@ class SubscriptionController extends ApiController
         ]);
     }
 
+    // NOTE: disabling this since we can just include the public key with the subscription creation endpoint
+    /*
     public function getPayMongoPublicKey(Request $req)
     {
         // check requirements
@@ -54,9 +56,10 @@ class SubscriptionController extends ApiController
 
         // response
         return new ApiResponse(true, '', [
-            'content' => $this->getParameter('subscription_paymongo_public_key'),
+            'key' => $this->getParameter('subscription_paymongo_public_key'),
         ]);
     }
+    */
 
     public function createSubscription(Request $req, PayMongoConnector $pm)
     {
@@ -87,13 +90,14 @@ class SubscriptionController extends ApiController
         // create subscription
         // NOTE: for now we save ourselves the extra API call and assume the plan_id is valid since this won't change often anyway
         $pm_sub = $pm->createSubscription($pm_cust['id'], $req->request->get('plan_id'));
-        if (!isset($pm_sub['data']['id'])) {
+        if (!isset($pm_sub['response']['data']['id'])) {
             return new ApiResponse(false, 'Error creating subscription. Please try again later.');
         }
 
         // response
         return new ApiResponse(true, '', [
-            'subscription_id' => $pm_sub['data']['id'],
+            'subscription_id' => $pm_sub['response']['data']['id'],
+            'paymongo_public_key' => $this->getParameter('subscription_paymongo_public_key'),
         ]);
     }
 }
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index b39d0fb2..a12c38a0 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -126,6 +126,7 @@ class PayMongoConnector
                     'description' => $plan_data['description'],
                     'interval' => $plan_data['interval'],
                     'interval_count' => $plan_data['interval_count'],
+                    'cycle_count' => $plan_data['cycle_count'],
                     'name' => $plan_data['name'],
                     'metadata' => $plan_data['metadata'],
                 ],
@@ -186,7 +187,7 @@ class PayMongoConnector
                 'attributes' => [
                     'first_name' => $cust->getFirstName(),
                     'last_name' => $cust->getLastName(),
-                    'phone' => $cust->getPhoneMobile(),
+                    'phone' => "+63" . $cust->getPhoneMobile(),
                     'email' => $cust->getEmail(),
                     'default_device' => 'email',
                 ],
@@ -246,16 +247,16 @@ class PayMongoConnector
 
         $pm_cust = null;
 
-        if (isset($found_cust['data']['id'])) {
+        if (isset($found_cust['response']['data'][0]['id'])) {
             // we found a customer record
-            $pm_cust = $found_cust['data'];
+            $pm_cust = $found_cust['response']['data'][0];
         } else {
             // we create a new customer record
             $new_cust = $this->createCustomer($cust);
 
-            if (isset($new_cust['data']['id'])) {
+            if (isset($new_cust['response']['data'][0]['id'])) {
                 // customer record was created successfully
-                $pm_cust = $new_cust['data'];
+                $pm_cust = $new_cust['response']['data'][0];
             }
         }
 

From 8c61a2737661c453b20b3caed6563998c5950b77 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Wed, 21 Aug 2024 07:44:08 +0800
Subject: [PATCH 19/27] Fix handling of payment intent values when returning
 created sub details #799

---
 .../CustomerAppAPI/SubscriptionController.php | 21 +++++++++++--
 src/Service/PayMongoConnector.php             | 31 ++++++++++++++-----
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 33ac8792..60d3cda4 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -90,13 +90,30 @@ class SubscriptionController extends ApiController
         // create subscription
         // NOTE: for now we save ourselves the extra API call and assume the plan_id is valid since this won't change often anyway
         $pm_sub = $pm->createSubscription($pm_cust['id'], $req->request->get('plan_id'));
-        if (!isset($pm_sub['response']['data']['id'])) {
+        $sub_pi = $pm_sub['response']['data']['attributes']['latest_invoice']['payment_intent'] ?? null;
+
+        // not the response we expected
+        if (empty($sub_pi)) {
             return new ApiResponse(false, 'Error creating subscription. Please try again later.');
         }
 
+        // the payment intent must still be in a pending state
+        // TODO: log this somewhere
+        if ($sub_pi['status'] !== 'awaiting_payment_method') {
+            return new ApiResponse(false, 'Error creating subscription invoice. Please try again later.');
+        }
+
+        // fetch payment intent details for client key
+        $pi = $pm->getPaymentIntent($sub_pi['id']);
+        if (empty($pi['response']['data']['id'])) {
+            return new ApiResponse(false, 'Error retrieving payment intent. Please try again later.');
+        }
+
         // response
         return new ApiResponse(true, '', [
-            'subscription_id' => $pm_sub['response']['data']['id'],
+            //'subscription_id' => $pm_sub['response']['data']['id'],
+            'payment_intent_id' => $pi['response']['data']['id'],
+            'payment_intent_client_key' => $pi['response']['data']['attributes']['client_key'],
             'paymongo_public_key' => $this->getParameter('subscription_paymongo_public_key'),
         ]);
     }
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index a12c38a0..5b1ff86b 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -14,7 +14,9 @@ class PayMongoConnector
     protected $base_url;
     protected $public_key;
     protected $secret_key;
-    protected $hash;
+
+    protected $public_hash;
+    protected $secret_hash;
 
     public function __construct($base_url)
     {
@@ -25,7 +27,8 @@ class PayMongoConnector
     {
         $this->public_key = $public_key;
         $this->secret_key = $secret_key;
-        $this->hash = $this->generateHash();
+        $this->public_hash = $this->generateHash($this->public_key);
+        $this->secret_hash = $this->generateHash($this->secret_key);
     }
 
     public function createCheckout(Customer $cust, $items, $ref_no = null, $description = null, $success_url = null, $cancel_url = null, $metadata = [])
@@ -278,6 +281,11 @@ class PayMongoConnector
         return $this->doRequest('/v1/subscriptions', 'POST', $body);
     }
 
+    public function getPaymentIntent($pi_id)
+    {
+        return $this->doRequest('/v1/payment_intents/' . $pi_id, 'GET');
+    }
+
     public function attachPaymentIntent($pm_id, $pi_id)
     {
         $body = [
@@ -291,19 +299,26 @@ class PayMongoConnector
         return $this->doRequest('/v1/payment_intents/' . $pi_id . '/attach', 'POST', $body);
     }
 
-    protected function generateHash()
+    protected function generateHash($key)
     {
-        return base64_encode($this->secret_key);
+        return base64_encode($key);
     }
 
-    protected function doRequest($url, $method, $request_body = [])
+    protected function buildHeaders($use_public_key = false)
     {
-        $client = new Client();
-        $headers = [
+        $hash = $use_public_key ? $this->public_hash : $this->secret_hash;
+
+        return [
             'Content-Type' => 'application/json',
             'accept' => 'application/json',
-            'authorization' => 'Basic '. $this->hash,
+            'authorization' => 'Basic '. $hash,
         ];
+    }
+
+    protected function doRequest($url, $method, $request_body = [], $use_public_key = false)
+    {
+        $client = new Client();
+        $headers = $this->buildHeaders($use_public_key);
 
         $request_params = ['headers' => $headers];
 

From d7cc0fc3de6f9b469c3bc835a8e322db78a50dad Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Thu, 22 Aug 2024 06:19:42 +0800
Subject: [PATCH 20/27] Add endpoint for re-checking payment intent status #799

---
 config/routes/apiv2.yaml                      |  5 +++++
 .../CustomerAppAPI/SubscriptionController.php | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index bb534de1..5faa26dc 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -335,3 +335,8 @@ apiv2_subscription_create:
     path: /apiv2/subscription
     controller: App\Controller\CustomerAppAPI\SubscriptionController::createSubscription
     methods: [POST]
+
+apiv2_subscription_payment_intent:
+    path: /apiv2/subscription/payment_intent/{pid}
+    controller: App\Controller\CustomerAppAPI\SubscriptionController::getPaymentIntent
+    methods: [GET]
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 60d3cda4..870c1cb2 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -117,4 +117,25 @@ class SubscriptionController extends ApiController
             'paymongo_public_key' => $this->getParameter('subscription_paymongo_public_key'),
         ]);
     }
+
+    public function getPaymentIntent(Request $req, $pid, PayMongoConnector $pm)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get payment intent
+        $pi = $pm->getPaymentIntent($pid);
+        if (empty($pi['response']['data']['id'])) {
+            return new ApiResponse(false, 'Error retrieving payment intent. Please try again later.');
+        }
+
+        // response
+        return new ApiResponse(true, '', [
+            'payment_intent' => $pi,
+        ]);
+    }
 }

From 9dbaf926987b4a7e295f7d256152a910c52b4aa4 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Fri, 23 Aug 2024 05:07:11 +0800
Subject: [PATCH 21/27] Add missing basic auth to payment intent endpoint #799

---
 src/Controller/CustomerAppAPI/SubscriptionController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 870c1cb2..6025664c 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -127,6 +127,9 @@ class SubscriptionController extends ApiController
             return new ApiResponse(false, $validity['error']);
         }
 
+        // initialize paymongo connector
+        $this->initializeSubscriptionPayMongoConnector($pm);
+
         // get payment intent
         $pi = $pm->getPaymentIntent($pid);
         if (empty($pi['response']['data']['id'])) {

From 62f11c9ef597685f26f23546909cf70bfe6a04f7 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Fri, 23 Aug 2024 07:51:53 +0800
Subject: [PATCH 22/27] Fix json payload structure for payment intent checking
 #799

---
 src/Controller/CustomerAppAPI/SubscriptionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 6025664c..290ea43a 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -138,7 +138,7 @@ class SubscriptionController extends ApiController
 
         // response
         return new ApiResponse(true, '', [
-            'payment_intent' => $pi,
+            'payment_intent' => $pi['response']['data'],
         ]);
     }
 }

From aa85198b7a40698e951936ed716a455fa7ce446e Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 24 Aug 2024 07:50:50 +0800
Subject: [PATCH 23/27] Add subscription entity #799

---
 src/Entity/CustomerVehicle.php    |  29 ++++-
 src/Entity/Subscription.php       | 194 ++++++++++++++++++++++++++++++
 src/Ramcar/SubscriptionStatus.php |  20 +++
 3 files changed, 240 insertions(+), 3 deletions(-)
 create mode 100644 src/Entity/Subscription.php
 create mode 100644 src/Ramcar/SubscriptionStatus.php

diff --git a/src/Entity/CustomerVehicle.php b/src/Entity/CustomerVehicle.php
index f36c1de5..c39e46c0 100644
--- a/src/Entity/CustomerVehicle.php
+++ b/src/Entity/CustomerVehicle.php
@@ -3,6 +3,7 @@
 namespace App\Entity;
 
 use App\Ramcar\InsuranceApplicationStatus;
+use App\Ramcar\SubscriptionStatus;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
 
@@ -122,6 +123,12 @@ class CustomerVehicle
      */
     protected $insurance_applications;
 
+    // link to subscription
+    /**
+     * @ORM\OneToMany(targetEntity="Subscription", mappedBy="customer_vehicle")
+     */
+    protected $subscriptions;
+
     public function __construct()
     {
         $this->flag_active = true;
@@ -307,9 +314,25 @@ class CustomerVehicle
         return !empty($result) ? $result[0] : null;
     }
 
-    public function getLatestActiveSubscription()
+    public function getSubscriptions()
     {
-        // TODO: get latest active sub using relationship to be built
-        return null;
+        return $this->subscriptions;
+    }
+
+    public function getLatestSubscription()
+    {
+        // we get the latest subscription that actually started
+        $criteria = Criteria::create()
+            ->where(Criteria::expr()->notIn('status', [
+                SubscriptionStatus::CANCELLED,
+                SubscriptionStatus::PENDING,
+            ]))
+            ->where(Criteria::expr()->neq('date_start', null))
+            ->orderBy(['date_create' => Criteria::DESC])
+            ->setMaxResults(1);
+
+        $result = $this->subscriptions->matching($criteria);
+
+        return !empty($result) ? $result[0] : null;
     }
 }
diff --git a/src/Entity/Subscription.php b/src/Entity/Subscription.php
new file mode 100644
index 00000000..1db78332
--- /dev/null
+++ b/src/Entity/Subscription.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Validator\Constraints as Assert;
+
+use DateTime;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="subscription")
+ */
+class Subscription
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    // link to customer
+    /**
+     * @ORM\ManyToOne(targetEntity="Customer")
+     * @ORM\JoinColumn(name="customer_id", referencedColumnName="id")
+     */
+    protected $customer;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="CustomerVehicle", inversedBy="subscriptions")
+     * @ORM\JoinColumn(name="customer_vehicle_id", referencedColumnName="id")
+     */
+    protected $customer_vehicle;
+
+    // date subscription was created
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    protected $date_create;
+
+    // date subscription starts
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_start;
+
+    // date subscription ends
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_end;
+
+    // date subscription was cancelled
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_cancel;
+
+    // external api id (paymongo)
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $ext_api_id;
+
+    // status of the subscription
+    /**
+     * @ORM\Column(type="string", length=50)
+     * @Assert\NotBlank()
+     */
+    protected $status;
+
+    // other data related to the transaction
+    /**
+     * @ORM\Column(type="json")
+     */
+    protected $metadata;
+
+    public function __construct()
+    {
+        $this->date_create = new DateTime();
+        $this->date_start = null;
+        $this->date_end = null;
+        $this->date_cancel = null;
+        $this->metadata = [];
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setCustomer(Customer $cust = null)
+    {
+        $this->customer = $cust;
+        return $this;
+    }
+
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+
+    public function setCustomerVehicle(CustomerVehicle $customer_vehicle)
+    {
+        $this->customer_vehicle = $customer_vehicle;
+        return $this;
+    }
+
+    public function getCustomerVehicle()
+    {
+        return $this->customer_vehicle;
+    }
+
+    public function setDateCreate(DateTime $date)
+    {
+        $this->date_create = $date;
+        return $this;
+    }
+
+    public function getDateCreate()
+    {
+        return $this->date_create;
+    }
+
+    public function setDateStart(DateTime $date)
+    {
+        $this->date_start = $date;
+        return $this;
+    }
+
+    public function getDateStart()
+    {
+        return $this->date_start;
+    }
+
+    public function setDateEnd(DateTime $date)
+    {
+        $this->date_end = $date;
+        return $this;
+    }
+
+    public function getDateEnd()
+    {
+        return $this->date_end;
+    }
+
+    public function setDateCancel(DateTime $date)
+    {
+        $this->date_cancel = $date;
+        return $this;
+    }
+
+    public function getDateCancel()
+    {
+        return $this->date_cancel;
+    }
+
+    public function setStatus($status)
+    {
+        return $this->status = $status;
+    }
+
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    public function setExtApiId($ext_api_id)
+    {
+        return $this->ext_api_id = $ext_api_id;
+    }
+
+    public function getExtApiId()
+    {
+        return $this->ext_api_id;
+    }
+
+    public function setMetadata($metadata)
+    {
+        return $this->metadata = $metadata;
+    }
+
+    public function getMetadata()
+    {
+        return $this->metadata;
+    }
+
+    public function getGatewayTransactions()
+    {
+        // TODO: get gateway transactions here via type and metadata
+    }
+}
diff --git a/src/Ramcar/SubscriptionStatus.php b/src/Ramcar/SubscriptionStatus.php
new file mode 100644
index 00000000..9c957497
--- /dev/null
+++ b/src/Ramcar/SubscriptionStatus.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Ramcar;
+
+class SubscriptionStatus extends NameValue
+{
+    const PENDING       = 'pending';
+    const ACTIVE        = 'active';
+    const ENDED         = 'ended';
+    const CANCELLED     = 'cancelled';
+    const REPOSSESSED   = 'reposessed';
+
+    const COLLECTION = [
+        'pending' => 'Pending',
+        'active' => 'Active',
+        'ended' => 'Ended',
+        'cancelled' => 'Cancelled',
+        'repossessed' => 'Reposessed',
+    ];
+}

From 40c629eee30769684114b1986883858f94442666 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sat, 24 Aug 2024 18:00:38 +0800
Subject: [PATCH 24/27] Add endpoint for activating a subscription #799

---
 .../CustomerAppAPI/SubscriptionController.php | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index 290ea43a..f178c840 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -7,6 +7,11 @@ use Catalyst\ApiBundle\Component\Response as ApiResponse;
 use App\Service\PayMongoConnector;
 
 use App\Entity\Vehicle;
+use App\Entity\Subscription;
+use App\Entity\CustomerVehicle;
+use App\Ramcar\SubscriptionStatus;
+
+use DateTime;
 
 class SubscriptionController extends ApiController
 {
@@ -66,6 +71,7 @@ class SubscriptionController extends ApiController
         // check requirements
         $validity = $this->validateRequest($req, [
             'plan_id',
+            'cv_id',
         ]);
 
         if (!$validity['is_valid']) {
@@ -78,6 +84,19 @@ class SubscriptionController extends ApiController
             return new ApiResponse(false, 'No customer information found.');
         }
 
+        // get customer vehicle
+        $cv = $this->em->getRepository(CustomerVehicle::class)->find($req->request->get('cv_id'));
+
+        // check if it exists
+        if ($cv == null) {
+            return new ApiResponse(false, 'Vehicle does not exist.');
+        }
+
+        // check if it's owned by customer
+        if ($cv->getCustomer()->getID() != $cust->getID()) {
+            return new ApiResponse(false, 'Invalid vehicle.');
+        }
+
         // initialize paymongo connector
         $this->initializeSubscriptionPayMongoConnector($pm);
 
@@ -109,9 +128,20 @@ class SubscriptionController extends ApiController
             return new ApiResponse(false, 'Error retrieving payment intent. Please try again later.');
         }
 
+        // create subscription entity
+        $obj = new Subscription();
+        $obj->setCustomer($cust)
+            ->setCustomerVehicle($cv)
+            ->setStatus(SubscriptionStatus::PENDING)
+            ->setExtApiId($pm_sub['response']['data']['id'])
+            ->setMetadata($pm_sub['response']['data']);
+
+        $this->em->persist($obj);
+        $this->em->flush();
+
         // response
         return new ApiResponse(true, '', [
-            //'subscription_id' => $pm_sub['response']['data']['id'],
+            'subscription_id' => $obj->getID(),
             'payment_intent_id' => $pi['response']['data']['id'],
             'payment_intent_client_key' => $pi['response']['data']['attributes']['client_key'],
             'paymongo_public_key' => $this->getParameter('subscription_paymongo_public_key'),
@@ -141,4 +171,39 @@ class SubscriptionController extends ApiController
             'payment_intent' => $pi['response']['data'],
         ]);
     }
+
+    public function setSubscriptionAsPaid(Request $req, $sub_id, PayMongoConnector $pm)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // initialize paymongo connector
+        $this->initializeSubscriptionPayMongoConnector($pm);
+
+        // get subscription
+        $obj = $this->em->getRepository(Subscription::class)->findOneBy([
+            'id' => $sub_id,
+            'status' => SubscriptionStatus::PENDING,
+            'customer' => $this->session->getCustomer(),
+        ]);
+
+        if (empty($obj)) {
+            return new ApiResponse(false, 'Invalid subscription provided.');
+        }
+
+        // mark subscription as paid
+        $obj->setStatus(SubscriptionStatus::ACTIVE)
+            ->setDateStart(new DateTime());
+
+        $this->em->flush();
+
+        // response
+        return new ApiResponse(true, '', [
+            'success' => true,
+        ]);
+    }
 }

From 1fd883b07b80d6a77ee5677bff4f9efbbb17c73d Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 26 Aug 2024 08:01:00 +0800
Subject: [PATCH 25/27] Consolidate subscription setup payment intent checking
 and initial activation when applicable #799

---
 config/routes/apiv2.yaml                      | 16 +++-
 config/services.yaml                          |  1 +
 .../CustomerAppAPI/SubscriptionController.php | 84 ++++++++++++++++++-
 .../CustomerAppAPI/VehicleController.php      |  7 +-
 src/Entity/Subscription.php                   |  9 +-
 src/Service/PayMongoConnector.php             |  5 ++
 6 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/config/routes/apiv2.yaml b/config/routes/apiv2.yaml
index 5faa26dc..7cc70e46 100644
--- a/config/routes/apiv2.yaml
+++ b/config/routes/apiv2.yaml
@@ -336,7 +336,17 @@ apiv2_subscription_create:
     controller: App\Controller\CustomerAppAPI\SubscriptionController::createSubscription
     methods: [POST]
 
-apiv2_subscription_payment_intent:
-    path: /apiv2/subscription/payment_intent/{pid}
-    controller: App\Controller\CustomerAppAPI\SubscriptionController::getPaymentIntent
+apiv2_subscription_finalize:
+    path: /apiv2/subscription/{id}/finalize
+    controller: App\Controller\CustomerAppAPI\SubscriptionController::finalizeSubscription
     methods: [GET]
+
+#apiv2_subscription_payment_intent:
+#    path: /apiv2/subscription/payment_intent/{pi_id}
+#    controller: App\Controller\CustomerAppAPI\SubscriptionController::getPaymentIntent
+#    methods: [GET]
+
+#apiv2_subscription_activate:
+#    path: /apiv2/subscription/{id}/activate
+#    controller: App\Controller\CustomerAppAPI\SubscriptionController::activateSubscription
+#    methods: [POST]
diff --git a/config/services.yaml b/config/services.yaml
index f2db62c5..c8b61c7a 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -23,6 +23,7 @@ parameters:
     subscription_paymongo_public_key: "%env(SUBSCRIPTION_PAYMONGO_PUBLIC_KEY)%"
     subscription_paymongo_secret_key: "%env(SUBSCRIPTION_PAYMONGO_SECRET_KEY)%"
     subscription_paymongo_webhook_id: "%env(SUBSCRIPTION_PAYMONGO_WEBHOOK_ID)%"
+    subscription_months: "%env(SUBSCRIPTION_MONTHS)%"
 
 services:
     # default configuration for services in *this* file
diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index f178c840..e0ac7aea 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -148,6 +148,74 @@ class SubscriptionController extends ApiController
         ]);
     }
 
+    public function finalizeSubscription(Request $req, $id, PayMongoConnector $pm)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // initialize paymongo connector
+        $this->initializeSubscriptionPayMongoConnector($pm);
+
+        // get subscription
+        $sub_obj = $this->em->getRepository(Subscription::class)->findOneBy([
+            'id' => $id,
+            'status' => SubscriptionStatus::PENDING,
+            'customer' => $this->session->getCustomer(),
+        ]);
+
+        if (empty($sub_obj)) {
+            return new ApiResponse(false, 'Invalid subscription provided.');
+        }
+
+        // get paymongo subscription so we can verify if the latest invoice is paid or not
+        $pm_sub = $pm->getSubscription($sub_obj->getExtApiId());
+        if (empty($pm_sub['response']['data']['id'])) {
+            return new ApiResponse(false, 'Error retrieving subscription. Please try again later.');
+        }
+
+        // make sure the latest invoice has been paid
+        // NOTE: ignore this, this is unreliable due to race condition
+        /*
+        if ($pm_sub['response']['data']['attributes']['latest_invoice']['status'] !== 'paid') {
+            return new ApiResponse(false, 'Latest invoice for subscription is not yet paid.');
+        }
+        */
+
+        // get payment intent
+        $pi = $pm->getPaymentIntent($pm_sub['response']['data']['attributes']['latest_invoice']['payment_intent']['id']);
+        if (empty($pi['response']['data']['id'])) {
+            return new ApiResponse(false, 'Error retrieving payment intent. Please try again later.');
+        }
+
+        // if the paymongo sub is active, and the payment was successful, update the internal subscription status
+        if (
+            $sub_obj->getStatus() === SubscriptionStatus::PENDING &&
+            $pi['response']['data']['attributes']['status'] === 'succeeded'
+        ) {
+            $sub_start_date = new DateTime();
+            $sub_end_date = clone $sub_start_date;
+            $sub_end_date->modify('+' . $this->getParameter('subscription_months') . ' month');
+
+            $sub_obj->setStatus(SubscriptionStatus::ACTIVE)
+                ->setDateStart($sub_start_date)
+                ->setDateEnd($sub_end_date);
+
+            $this->em->flush();
+        }
+
+        error_log("PI STATUS: " . $pi['response']['data']['attributes']['status']);
+
+         // response
+         return new ApiResponse(true, '', [
+            'payment_intent' => $pi['response']['data'],
+        ]);
+    }
+
+    /*
     public function getPaymentIntent(Request $req, $pid, PayMongoConnector $pm)
     {
         // check requirements
@@ -172,7 +240,7 @@ class SubscriptionController extends ApiController
         ]);
     }
 
-    public function setSubscriptionAsPaid(Request $req, $sub_id, PayMongoConnector $pm)
+    public function activateSubscription(Request $req, $id, PayMongoConnector $pm)
     {
         // check requirements
         $validity = $this->validateRequest($req);
@@ -186,7 +254,7 @@ class SubscriptionController extends ApiController
 
         // get subscription
         $obj = $this->em->getRepository(Subscription::class)->findOneBy([
-            'id' => $sub_id,
+            'id' => $id,
             'status' => SubscriptionStatus::PENDING,
             'customer' => $this->session->getCustomer(),
         ]);
@@ -195,6 +263,17 @@ class SubscriptionController extends ApiController
             return new ApiResponse(false, 'Invalid subscription provided.');
         }
 
+        // get paymongo subscription so we can verify if the latest invoice is paid or not
+        $pm_sub = $pm->getSubscription($obj->getExtApiId());
+        if (empty($pm_sub['response']['data']['id'])) {
+            return new ApiResponse(false, 'Error retrieving subscription. Please try again later.');
+        }
+
+        // make sure the latest invoice has been paid
+        if ($pm_sub['response']['data']['attributes']['latest_invoice']['status'] !== 'succeeded') {
+            return new ApiResponse(false, 'Latest invoice for subscription is not yet paid.');
+        }
+        
         // mark subscription as paid
         $obj->setStatus(SubscriptionStatus::ACTIVE)
             ->setDateStart(new DateTime());
@@ -206,4 +285,5 @@ class SubscriptionController extends ApiController
             'success' => true,
         ]);
     }
+    */
 }
diff --git a/src/Controller/CustomerAppAPI/VehicleController.php b/src/Controller/CustomerAppAPI/VehicleController.php
index 0ca16872..3c62ebec 100644
--- a/src/Controller/CustomerAppAPI/VehicleController.php
+++ b/src/Controller/CustomerAppAPI/VehicleController.php
@@ -16,6 +16,7 @@ use App\Ramcar\JOStatus;
 use App\Ramcar\ServiceType;
 use App\Ramcar\TradeInType;
 use App\Ramcar\InsuranceApplicationStatus;
+use App\Ramcar\SubscriptionStatus;
 use App\Service\PayMongoConnector;
 use App\Service\PriceTierManager;
 use DateTime;
@@ -518,9 +519,9 @@ class VehicleController extends ApiController
         // get active subscription row
         if ($include_active_sub) {
             $active_sub = null;
-            $sobj = $cv->getLatestActiveSubscription();
-            if (!empty($sobj)) {
-
+            $sobj = $cv->getLatestSubscription();
+            if (!empty($sobj) && $sobj->getStatus() == SubscriptionStatus::ACTIVE) {
+                $active_sub = $sobj;
             }
 
             $row['active_subscription'] = $active_sub;
diff --git a/src/Entity/Subscription.php b/src/Entity/Subscription.php
index 1db78332..344279e5 100644
--- a/src/Entity/Subscription.php
+++ b/src/Entity/Subscription.php
@@ -159,7 +159,8 @@ class Subscription
 
     public function setStatus($status)
     {
-        return $this->status = $status;
+        $this->status = $status;
+        return $this;
     }
 
     public function getStatus()
@@ -169,7 +170,8 @@ class Subscription
 
     public function setExtApiId($ext_api_id)
     {
-        return $this->ext_api_id = $ext_api_id;
+        $this->ext_api_id = $ext_api_id;
+        return $this;
     }
 
     public function getExtApiId()
@@ -179,7 +181,8 @@ class Subscription
 
     public function setMetadata($metadata)
     {
-        return $this->metadata = $metadata;
+        $this->metadata = $metadata;
+        return $this;
     }
 
     public function getMetadata()
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index 5b1ff86b..dcc2d509 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -281,6 +281,11 @@ class PayMongoConnector
         return $this->doRequest('/v1/subscriptions', 'POST', $body);
     }
 
+    public function getSubscription($sub_id)
+    {
+        return $this->doRequest('/v1/subscriptions/'. $sub_id, 'GET');
+    }
+
     public function getPaymentIntent($pi_id)
     {
         return $this->doRequest('/v1/payment_intents/' . $pi_id, 'GET');

From 5056637b662477d65b737719a41c3f3eaa08296f Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Wed, 2 Oct 2024 13:27:37 +0800
Subject: [PATCH 26/27] Add email field to subscription entity #799

---
 src/Entity/Subscription.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Entity/Subscription.php b/src/Entity/Subscription.php
index 344279e5..1906bbf9 100644
--- a/src/Entity/Subscription.php
+++ b/src/Entity/Subscription.php
@@ -34,6 +34,12 @@ class Subscription
      */
     protected $customer_vehicle;
 
+    // email address
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $email;
+
     // date subscription was created
     /**
      * @ORM\Column(type="datetime")
@@ -168,6 +174,17 @@ class Subscription
         return $this->status;
     }
 
+    public function setEmail($email)
+    {
+        $this->email = $email;
+        return $this;
+    }
+
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
     public function setExtApiId($ext_api_id)
     {
         $this->ext_api_id = $ext_api_id;

From d2a0638ffa890a85013a9f873d472583941b65f4 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Wed, 2 Oct 2024 13:28:27 +0800
Subject: [PATCH 27/27] Fix customer retrieval from paymongo #799

---
 .../CustomerAppAPI/SubscriptionController.php | 28 ++++++++++++-
 src/Service/PayMongoConnector.php             | 42 ++++++++++++-------
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/Controller/CustomerAppAPI/SubscriptionController.php b/src/Controller/CustomerAppAPI/SubscriptionController.php
index e0ac7aea..2a22961d 100644
--- a/src/Controller/CustomerAppAPI/SubscriptionController.php
+++ b/src/Controller/CustomerAppAPI/SubscriptionController.php
@@ -6,6 +6,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
 use App\Service\PayMongoConnector;
 
+use App\Entity\Customer;
 use App\Entity\Vehicle;
 use App\Entity\Subscription;
 use App\Entity\CustomerVehicle;
@@ -42,6 +43,8 @@ class SubscriptionController extends ApiController
             $plan = $pm->getPlanByBatterySize($batts[0]->getSize());
         }
 
+        error_log("FOUND PLAN FOR $vid: " . print_r($plan, true));
+
         // response
         return new ApiResponse(true, '', [
             'plan' => $plan,
@@ -72,6 +75,7 @@ class SubscriptionController extends ApiController
         $validity = $this->validateRequest($req, [
             'plan_id',
             'cv_id',
+            'email',
         ]);
 
         if (!$validity['is_valid']) {
@@ -84,6 +88,21 @@ class SubscriptionController extends ApiController
             return new ApiResponse(false, 'No customer information found.');
         }
 
+        // verify email does not belong to someone else
+        $email = $req->request->get('email');
+        $qb = $this->em->getRepository(Customer::class)
+            ->createQueryBuilder('c')
+            ->select('c')
+            ->where('c.email = :email')
+            ->andWhere('c.id != :cust_id')
+            ->setParameter('email', $email)
+            ->setParameter('cust_id', $cust->getID());
+
+        $email_exists = $qb->getQuery()->getOneOrNullResult();
+        if (!empty($email_exists)) {
+            return new ApiResponse(false, 'Email is already in use. Please use a different email address.');
+        }
+
         // get customer vehicle
         $cv = $this->em->getRepository(CustomerVehicle::class)->find($req->request->get('cv_id'));
 
@@ -101,7 +120,7 @@ class SubscriptionController extends ApiController
         $this->initializeSubscriptionPayMongoConnector($pm);
 
         // get paymongo customer 
-        $pm_cust = $pm->findOrCreateCustomer($cust);
+        $pm_cust = $pm->findOrCreateCustomer($email, $cust);
         if (empty($pm_cust)) {
             return new ApiResponse(false, 'Error retrieving customer record. Please try again later.');
         }
@@ -132,10 +151,17 @@ class SubscriptionController extends ApiController
         $obj = new Subscription();
         $obj->setCustomer($cust)
             ->setCustomerVehicle($cv)
+            ->setEmail($email)
             ->setStatus(SubscriptionStatus::PENDING)
             ->setExtApiId($pm_sub['response']['data']['id'])
             ->setMetadata($pm_sub['response']['data']);
 
+        // if requested to save email, save it
+        if (!empty($req->request->get('remember_email'))) {
+            $cust->setEmail($email);
+        }
+
+        // save stuff to db
         $this->em->persist($obj);
         $this->em->flush();
 
diff --git a/src/Service/PayMongoConnector.php b/src/Service/PayMongoConnector.php
index dcc2d509..90748ac8 100644
--- a/src/Service/PayMongoConnector.php
+++ b/src/Service/PayMongoConnector.php
@@ -2,12 +2,15 @@
 
 namespace App\Service;
 
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Exception\RequestException;
 
 use App\Entity\Customer;
 use App\Entity\BatterySize;
+use Doctrine\ORM\Query\Parameter;
 
 class PayMongoConnector
 {
@@ -18,9 +21,12 @@ class PayMongoConnector
     protected $public_hash;
     protected $secret_hash;
 
-    public function __construct($base_url)
+    protected $sub_months;
+
+    public function __construct($base_url, ParameterBagInterface $params)
     {
         $this->base_url = $base_url;
+        $this->sub_months = $params->get('subscription_months');
     }
 
     public function initialize($public_key, $secret_key)
@@ -94,7 +100,7 @@ class PayMongoConnector
 
     public function getPlans()
     {
-        return $this->doRequest('/v1/subscriptions/plans', 'GET');
+        return $this->doRequest('/v1/subscriptions/plans?limit=100', 'GET');
     }
 
     public function getPlanByBatterySize(BatterySize $bsize)
@@ -129,7 +135,7 @@ class PayMongoConnector
                     'description' => $plan_data['description'],
                     'interval' => $plan_data['interval'],
                     'interval_count' => $plan_data['interval_count'],
-                    'cycle_count' => $plan_data['cycle_count'],
+                    //'cycle_count' => $plan_data['cycle_count'],
                     'name' => $plan_data['name'],
                     'metadata' => $plan_data['metadata'],
                 ],
@@ -169,6 +175,7 @@ class PayMongoConnector
                 'description' => "Motolite Battery Subscription Plan",
                 'interval' => 'monthly',
                 'interval_count' => 1,
+                //'cycle_count' => $this->sub_months,
                 'metadata' => [
                     'battery_size_id' => (string)$bsize->getID(),
                 ],
@@ -183,7 +190,7 @@ class PayMongoConnector
         return $this->doRequest('/v1/customers?email=' . $email, 'GET');
     }
 
-    public function createCustomer(Customer $cust)
+    public function createCustomer(Customer $cust, $email_override = "")
     {
         $body = [
             'data' => [
@@ -191,7 +198,7 @@ class PayMongoConnector
                     'first_name' => $cust->getFirstName(),
                     'last_name' => $cust->getLastName(),
                     'phone' => "+63" . $cust->getPhoneMobile(),
-                    'email' => $cust->getEmail(),
+                    'email' => $email_override ?? $cust->getEmail(),
                     'default_device' => 'email',
                 ],
             ],
@@ -236,30 +243,33 @@ class PayMongoConnector
         return false;
     }
 
-    public function findOrCreateCustomer(Customer $cust)
+    public function findOrCreateCustomer($email, Customer $cust)
     {
-        $email = $cust->getEmail();
-
-        // if no email, then we don't need to update
-        if (empty($email)) {
-            return false;
-        }
-
+        error_log("FINDING RECORD FOR $email");
+        
         // check if we have an existing paymongo customer with this email
         $found_cust = $this->findCustomerByEmail($email);
 
         $pm_cust = null;
 
+        error_log("FOUND CUSTOMER?");
+        error_log(print_r($found_cust, true));
+
         if (isset($found_cust['response']['data'][0]['id'])) {
             // we found a customer record
             $pm_cust = $found_cust['response']['data'][0];
         } else {
+            error_log("CREATING CUSTOMER");
+            
             // we create a new customer record
-            $new_cust = $this->createCustomer($cust);
+            $new_cust = $this->createCustomer($cust, $email);
 
-            if (isset($new_cust['response']['data'][0]['id'])) {
+            error_log("NEW CUST RESPONSE");
+            error_log(print_r($new_cust, true));
+
+            if (isset($new_cust['response']['data']['id'])) {
                 // customer record was created successfully
-                $pm_cust = $new_cust['response']['data'][0];
+                $pm_cust = $new_cust['response']['data'];
             }
         }