From e92d5f9b879bb5ec0f5f5067c1314ff63c1d05c6 Mon Sep 17 00:00:00 2001
From: Miguel Pinto <darkymiguel@gmail.com>
Date: Tue, 28 Jan 2025 12:39:22 +0000
Subject: [PATCH] feat: fix merge issues

---
 app/services/payments/manual_create_service.rb |  2 +-
 schema.graphql                                 |  2 ++
 schema.json                                    | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/services/payments/manual_create_service.rb b/app/services/payments/manual_create_service.rb
index ed57846aacd..c1d1a71b481 100644
--- a/app/services/payments/manual_create_service.rb
+++ b/app/services/payments/manual_create_service.rb
@@ -56,7 +56,7 @@ def invoice
 
     def check_preconditions
       return result.not_found_failure!(resource: "invoice") unless invoice
-      return if invoice.invoice_type == :advance_charges
+      return if invoice.invoice_type == "advance_charges"
       return result.forbidden_failure! if !License.premium? && !invoice.organization.premium_integrations.include?('manual_payments')
       result.single_validation_failure!(error_code: "invalid_date", field: "paid_at") unless valid_paid_at?
     end
diff --git a/schema.graphql b/schema.graphql
index 7142a233dcd..706105a2c85 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -4446,6 +4446,7 @@ enum IntegrationTypeEnum {
   api_permissions
   auto_dunning
   hubspot
+  manual_payments
   netsuite
   okta
   progressive_billing
@@ -6433,6 +6434,7 @@ enum PremiumIntegrationTypeEnum {
   api_permissions
   auto_dunning
   hubspot
+  manual_payments
   netsuite
   okta
   progressive_billing
diff --git a/schema.json b/schema.json
index e7e1601bd4d..e4fc11280e0 100644
--- a/schema.json
+++ b/schema.json
@@ -20568,6 +20568,12 @@
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "manual_payments",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ]
         },
@@ -30626,6 +30632,12 @@
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "manual_payments",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ]
         },