Changeset 2617700

Timestamp:

10/21/2021 10:20:43 AM (4 years ago)

Author:

phcwordpress

Message:

upd 20211021

Location:

drivefx-woocommerce/trunk

Files:

• PHCLibrary/customers.php (modified) (2 diffs)
• PHCLibrary/utils.php (modified) (2 diffs)
• class.DriveFxWoocommerce.php (modified) (3 diffs)
• settings/backend.php (modified) (1 diff)

drivefx-woocommerce/trunk/PHCLibrary/customers.php

@@ -273 +273 @@
                 }
             }
-
             # Save Instance in Software PHC
             $paramsSaveResponse = $this->utils_services->paramsSave($ch, $credentials, 'ClWS', $response);
@@ -365 +364 @@
         $paramsSaveResponse = $this->utils_services->paramsSave($ch, $credentials, 'ClWS', $response);
 
-        $this->logs->writeFileLog('ClUpdate Save:', $paramsSaveResponse);
+        //$this->logs->writeFileLog('ClUpdate Save:', $paramsSaveResponse);
 
         if (curl_error($ch)) {

drivefx-woocommerce/trunk/PHCLibrary/utils.php

@@ -550 +550 @@
     ********************************************************************/
     //Header tosend Report to Email
-    public function paramsSendReportEmail($ch, $credentials, $repstamp, $ftstamp, $emailTo, $emailFrom, $docId, $reference, $body){
+    public function paramsSendReportEmail($ch, $credentials, $repstamp, $ftstamp, $emailTo, $emailFrom, $docId, $reference, $body, $emailCC){
         $this->url = $credentials->backendUrl."/REST/reportws/print";
 
@@ -558 +558 @@
                                         {"bcc":"",
                                         "body":"'.$body.'",
-                                        "cc":"",
+                                        "cc":"'.$emailCC.'",
                                         "isBodyHtml":false,
                                         "sendFrom":"'.$emailFrom.'",

drivefx-woocommerce/trunk/class.DriveFxWoocommerce.php

@@ -31 +31 @@
                 'dbname'            => array('label' => 'Database Name',                              'type' => 'text',          'required' => false, 'descr' => 'Enter the name of the PHC GO where you want save your information.<br>You can leave this empty if you only work with one company.', 'notice' => ''),
                 'createInvoice'     => array('label' => 'Create Orders and Invoices',                 'type' => 'checkbox',      'required' => false, 'checkboxDescription' => 'Create invoices for orders that come in, otherwise only the client is created (recommended).', 'notice' => ''),
-                'sendInvoice'       => array('label' => 'Send Invoice',                               'type' => 'checkbox',      'required' => false, 'checkboxDescription' => 'Send the client an e-mail with the order invoice attached', 'notice' => ''),
+                'sendInvoice'       => array('label' => 'Send Invoice',                               'type' => 'checkbox',      'required' => false, 'checkboxDescription' => 'Send to client an e-mail with the order invoice attached', 'notice' => ''),
                 'typeOfReport'      => array('label' => 'Type of Report',                             'type' => 'select',        'required' => false, 'checkboxDescription' => 'Choose the type of report for invoice documents', 'notice' => ''),
-                'emailBody'         => array('label' => 'E-mail body content',                        'type' => 'text',          'required' => false, 'descr' => 'Enter the text to be attached to the e-mails sent to the client.', 'notice' => ''),
+                'emailCC'           => array('label' => 'CC email',                                   'type' => 'text',          'required' => false, 'descr' => 'The CC field allows you to send a copy of the email to any recipient of your choice.', 'notice' => ''),
+                'emailBody'         => array('label' => 'Email body content',                         'type' => 'text',          'required' => false, 'descr' => 'Enter the text to be attached to the e-mails sent to the client.', 'notice' => ''),
                 'typeOfInvoice'     => array('label' => 'Type of Invoice Document (PT)',              'type' => 'select',        'required' => false, 'checkboxDescription' => 'Choose the type of invoice document (PT)', 'notice' => ''),
                 'typeOf_EU_Invoice' => array('label' => 'Type of Invoice Document (EU)',              'type' => 'select',        'required' => false, 'checkboxDescription' => 'Choose the type of invoice document (EU)', 'notice' => ''),
@@ -1679 +1680 @@
                         $emailAdmin = $infoAdmin[3]['default'];
                         ###
+                        $ccEmail = $settings['backend']['emailCC'];
                         $body = $settings['backend']['emailBody'];
 
@@ -1685 +1687 @@
                                                             $ch, $credentials, $_SESSION['repstamp'],
                                                             $_SESSION['ftstamp'], $_SESSION['emailClient'],
-                                                            $emailAdmin, $settings['backend']['typeOfInvoice'], '', $body);
+                                                            $emailAdmin, $settings['backend']['typeOfInvoice'], '',$body, $ccEmail);
 
                         //$this->logs->writeFileLog('paramsSendReportEmail:', $response);

drivefx-woocommerce/trunk/settings/backend.php

@@ -179 +179 @@
               <?php }
               echo $_SESSION[$id]; ?>
+            </td>
+          </tr>
+          <?php } break;
+        // CC email
+        case 'emailCC':
+          if($settings['backend']['createInvoice'] != '' && $settings['backend']['sendInvoice'] != ''){ ?>
+          <tr>
+            <th scope="row">
+              <label for="<?php echo $id ?>"><?php echo $opts['label'] ?></label>
+            </th>
+            <td>
+              <input class="regular-text" id="<?php echo $id ?>" type="<?php echo $opts['type'] ?>" name="<?php echo $name ?>" value="<?php echo $value ?>">
+              <p class="description"><?php echo $opts['descr'] ?></p>
             </td>
           </tr>