Add support to account id, payment type etc.

CRM/Civiquickbooks/Contact.php

@@ -576,11 +576,15 @@ protected function getQBOContacts($start_date_string) {
    *                   to be an Organisation otherwise.
    */
   protected function getQBOContactByName($name, $givenName = NULL) {
-    $query = (
-      empty($givenName)
-      ? sprintf("SELECT * FROM Customer WHERE FullyQualifiedName = '%s'", addslashes($name))
-      : sprintf("SELECT * FROM Customer WHERE FamilyName = '%s' AND GivenName = '%s'", addslashes($name), addslashes($givenName))
-    );
+    $givenName = trim($givenName);
+    $inputParam = ['1' => [$name, 'String']];
+    $query = 'SELECT * FROM Customer WHERE FullyQualifiedName = %1';
+    if (!empty($givenName)) {
+      $inputParam['2'] = [$givenName, 'String'];
+      $query = 'SELECT * FROM Customer WHERE FamilyName = %1 AND GivenName = %2';
+    }
+    // Switch to CiviCRM to handle the single quote present in the contact name.
+    $query = CRM_Core_DAO::composeQuery($query, $inputParam);
 
     try {
       $dataService = CRM_Quickbooks_APIHelper::getAccountingDataServiceObject();

CRM/Civiquickbooks/Invoice.php

@@ -97,6 +97,12 @@ public function push($params = [], $limit = PHP_INT_MAX) {
           }
 
           if ($accountsInvoice->Id) {
+            // Get invoice SyncToken to avoid Stale object error:
+            // You and XXXX were working on this at the same time. XXX
+            // finished before you did, so your work was not saved.
+            $invoiceExiting = $this->getInvoiceFromQBO($record);
+            $accountsInvoice->SyncToken = $invoiceExiting->SyncToken;
+
             $result = $dataService->Update($accountsInvoice);
 
             if ($last_error = $dataService->getLastError()) {
@@ -224,27 +230,51 @@ public static function pushPayments($contribution_id, $account_invoice) {
 
     $dataService = CRM_Quickbooks_APIHelper::getAccountingDataServiceObject();
     $result = [];
-
+    $quickbooksAccountId = civicrm_api3('Setting', 'getvalue', [
+      'name' => "quickbooks_account_id",
+      'group' => 'civiquickbooks',
+    ]);
+    $paymentInstrument = CRM_Contribute_BAO_Contribution::buildOptions('payment_instrument_id', 'create');
     foreach ($payments['values'] as $payment) {
       $txnDate = $payment['trxn_date'];
       $total = sprintf('%.5f', $payment['total_amount']);
-      $QBOPayment = \QuickBooksOnline\API\Facades\Payment::create(
-        [
-          'TotalAmt' => $total,
-          'CustomerRef' => $account_invoice->CustomerRef,
-          'CurrencyRef' => $account_invoice->CurrencyRef,
-          'TxnDate' => $txnDate,
-          'Line' => [
-            'Amount' => $total,
-            'LinkedTxn' => [
-              [
-                'TxnType' => 'Invoice',
-                'TxnId' => $account_invoice->Id,
-              ],
+      $paymentInput = [
+        'TotalAmt' => $total,
+        'CustomerRef' => $account_invoice->CustomerRef,
+        'CurrencyRef' => $account_invoice->CurrencyRef,
+        'TxnDate' => $txnDate,
+        'Line' => [
+          'Amount' => $total,
+          'LinkedTxn' => [
+            [
+              'TxnType' => 'Invoice',
+              'TxnId' => $account_invoice->Id,
             ],
           ],
-        ]
-      );
+        ],
+      ];
+      // check payment instrument present on record
+      if (!empty($payment['payment_instrument_id'])) {
+        $paymentMethodId = self::getPaymentMethod($paymentInstrument[$payment['payment_instrument_id']]);
+        if (!empty($paymentMethodId)) {
+          $paymentInput['PaymentMethodRef'] = ['value' => $paymentMethodId];
+        }
+      }
+
+      // set Account ID
+      if ($quickbooksAccountId) {
+        $paymentInput['DepositToAccountRef'] = ['value' => $quickbooksAccountId];
+      }
+
+      // set Transaction ID
+      if (!empty($payment['trxn_id'])) {
+        $paymentInput['PaymentRefNum'] = $payment['trxn_id'];
+      }
+      else if (!empty($payment['check_number'])) {
+        $paymentInput['PaymentRefNum'] = $payment['check_number'];
+      }
+
+      $QBOPayment = \QuickBooksOnline\API\Facades\Payment::create($paymentInput);
       $result[] = $dataService->Add($QBOPayment);
     }
 
@@ -628,7 +658,10 @@ protected function mapToAccounts($db_contribution, $accountsID, $SyncToken, $qb_
         }
 
         $lineTotal = $line_item['line_total'];
-
+        // Do not sync line items with zero quantity.
+        if (empty($line_item['qty'])) {
+          continue;
+        }
         $tmp = [
           'Id' => $i . '',
           'LineNum' => $i,
@@ -641,6 +674,9 @@ protected function mapToAccounts($db_contribution, $accountsID, $SyncToken, $qb_
             ],
             'UnitPrice' => $lineTotal / $line_item['qty'] * 1.00,
             'Qty' => $line_item['qty'] * 1,
+            'TaxCodeRef' => [
+              'value' => $line_item_tax_ref,
+            ],
           ],
         ];
 
@@ -853,6 +889,28 @@ public static function getQBOTaxCode($name) {
     return $codes[$name];
   }
 
+  /**
+   * get Payment Method for syncing
+   * @param $name
+   */
+  public static function getPaymentMethod($name) {
+    $name = strtolower($name);
+    $paymentMethods =& \Civi::$statics[__CLASS__][__FUNCTION__];
+    if (!isset($paymentMethods[$name])) {
+      $query = 'SELECT * From PaymentMethod';
+      $dataService = CRM_Quickbooks_APIHelper::getAccountingDataServiceObject();
+      $result = $dataService->Query($query);
+      if (empty($result)) {
+        return;
+      }
+      foreach ($result as $paymentMethodObject) {
+        $paymentMethods[strtolower($paymentMethodObject->Name)] = $paymentMethodObject->Id;
+      }
+    }
+
+    return $paymentMethods[$name];
+  }
+
   /**
    * Map fields for a cancelled contribution to be updated to QuickBooks.
    *
@@ -945,7 +1003,9 @@ protected function generateTaxDetails($line_items) {
    * @throws \CiviCRM_API3_Exception
    */
   protected function findPushContributions($params, $limit) {
+    // quickbook does not accept negative amount.
     $accountInvoices = AccountInvoice::get()
+      ->addJoin('Contribution AS contribution', 'INNER', ['contribution.total_amount', '>=', 0])
       ->addWhere('plugin', '=', $this->plugin)
       ->addWhere('connector_id', '=', 0)
       ->addWhere('accounts_status_id:name', 'NOT IN', ['completed'])

CRM/Quickbooks/APIHelper.php

@@ -1,6 +1,9 @@
 <?php
 
 use QuickBooksOnline\API\Core\HttpClients\FaultHandler;
+use CRM_Civiquickbooks_ExtensionUtil as E;
+
+require E::path('vendor/autoload.php');
 
 class CRM_Quickbooks_APIHelper {
 
@@ -317,4 +320,29 @@ public static function parseErrorResponse($error_response) {
 
     return $error_message;
   }
+
+  /**
+   * Function to get Accounts name and id.
+   * @return array
+   */
+  public static function accountsName() {
+    if (!CRM_Quickbooks_APIHelper::isAuthorized()) {
+      return [];
+    }
+    // Get the accounts name and id from QuickBooks.
+    try {
+      $query = "SELECT * From Account where AccountType = 'Bank' AND Classification = 'Asset'";
+      $dataService = CRM_Quickbooks_APIHelper::getAccountingDataServiceObject();
+      $result = $dataService->Query($query);
+      $accountNames = [];
+      foreach ($result as $accountNameObject) {
+        $accountNames[$accountNameObject->Id] = $accountNameObject->Name;
+      }
+
+      return $accountNames;
+    }
+    catch (Exception $e) {
+      return [];
+    }
+  }
 }

managed/navigation.mgd.php

@@ -16,7 +16,7 @@
         'url' => 'civicrm/admin/setting/quickbooks',
         'icon' => NULL,
         'permission' => [
-          'administer CiviCRM system',
+          'administer CiviCRM',
         ],
         'permission_operator' => 'AND',
         'parent_id.name' => 'Accounts_System',

settings/civiquickbooks.setting.php

@@ -310,4 +310,26 @@
     ],
     'settings_pages' => ['quickbooks' => ['weight' => 1]],
   ],
+  'quickbooks_account_id' => [
+    'group_name' => E::ts('QuickBooks Online Settings'),
+    'group' => 'civiquickbooks',
+    'name' => 'quickbooks_account_id',
+    'type' => 'String',
+    'add' => '5.13',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'QuickBook Payment Account ID',
+    'title' =>  'QuickBook Account ID',
+    'help_text' => 'QuickBook Account ID',
+    'html_type' => 'Select',
+    'default' => '',
+    'quick_form_type' => 'Select',
+    'html_attributes' => [
+      'class' => 'crm-select2',
+    ],
+    'pseudoconstant' => [
+      'callback' => 'CRM_Quickbooks_APIHelper::accountsName',
+    ],
+    'settings_pages' => ['quickbooks' => ['weight' => 1]],
+  ],
 ];

xml/Menu/civiquickbooks.xml

@@ -12,7 +12,7 @@
         <path>civicrm/admin/setting/quickbooks</path>
         <page_callback>CRM_Civiquickbooks_Form_Settings</page_callback>
         <title>QuickBooks Online Settings</title>
-        <access_arguments>access CiviCRM</access_arguments>
+        <access_arguments>administer CiviCRM</access_arguments>
     </item>
     <item>
         <path>civicrm/ajax/civiquickbooks/sync/contact/errors</path>