WordPress.org
Get WordPress

Plugin Directory

Changeset 3056880


Ignore:
Timestamp:
03/22/2024 02:22:22 PM (2 years ago)
Author:
primersoftware
Message:

Update

Location:
primer-mydata
Files:
2154 added
10 edited

Legend:

Unmodified
Added
Removed

  • primer-mydata/trunk/README.txt

    r3042613 r3056880  
    55Tested up to: 6.4.3
    66Requires PHP: 7.4
    7 Stable tag: 4.1.5
     7Stable tag: 4.1.6
    88License: GPLv2
    99License URI: https://www.gnu.org/licenses/gpl-2.0.html
    … …  
    7474== Changelog ==
    7575
     76= 4.1.6 - 2024-03-12 =
     77* Minor Bug Fixes
    7678= 4.1.5 - 2024-02-28 =
    7779* Fixed a bug with tax percentage taken from order

  • primer-mydata/trunk/admin/includes/my_data_json.php

    r3042613 r3056880  
    502502                    if ($tax_amount > 0) {
    503503                        $tax_rate = WC_Tax::_get_tax_rate($tax_rate_id);
    504                         $inside_tax_rate = $tax_rate['tax_rate'];
     504                        $inside_tax_rate = strval($tax_rate['tax_rate']);
    505505                        break;
    506506                    }
    … …  
    585585                $subtotal_item_tax = number_format((float)$subtotal_item_tax, 2, '.', '');
    586586                $subtotal_order_payment = number_format((float)$subtotal_order_payment, 2, '.', '');
    587                 if (($order_country == 'GR' || $order_invoice_type == 'receipt') && $outside_vat != 'yes') {
     587                if ($outside_vat != 'yes') {
    588588                    $total_net_value += $subtotal_order_payment;
    589589                    $total_vat_value += $subtotal_item_tax;
    … …  
    705705                $shipping_total = number_format((float)$shipping_total, 2, '.', '');
    706706                $shipping_tax = number_format((float)$shipping_tax, 2, '.', '');
    707                 if (($order_country !== 'GR' && $order_invoice_type != 'receipt') || $outside_vat == 'yes') {
     707                if ($outside_vat == 'yes') {
    708708                    $total_net_value += $shipping_total;
    709709                    $vatCategory_shipping = 7;
    … …  
    879879                    $item_count++;
    880880                }
    881                 //if ($shipping_tax > 0 && (($order_country !== 'GR') || ($outside_vat == 'yes'))) {
    882                 //    $item_count ++;
    883                 //}
    884881                $fee_total = number_format((float)$fee_total, 2, '.', '');
    885882                $fee_total_tax = number_format((float)$fee_total_tax, 2, '.', '');
    886883                $fee_net_value = number_format((float)$fee_net_value, 2, '.', '');
    887884                $subtotal = $subtotal + $fee_total;
    888                 if (($order_country == 'GR' || $order_invoice_type == 'receipt') && $outside_vat != 'yes') {
     885                if ($outside_vat != 'yes') {
    889886                    $total_net_value += $fee_total;
    890887                    $total_vat_value += $fee_total_tax;
    … …  
    907904                    $total_net_value += $fee_total;
    908905                    $vatCategory_fee = 7;
    909                     if ($shipping_tax > 0 && (($order_country !== 'GR') || ($outside_vat == 'yes'))) {
     906                    if ($shipping_tax > 0 && $outside_vat == 'yes') {
    910907                        $item_count ++;
    911908                    }
    … …  
    10051002            $shipping_total = number_format((float)$shipping_total, 2, '.', '');
    10061003            $total_sub_shipping = number_format((float)$total_sub_shipping, 2, '.', '');
    1007             if (($order_country == 'GR' || $order_invoice_type == 'receipt') && $outside_vat != 'yes') {
     1004            if ($outside_vat != 'yes') {
    10081005                $invoice_data['invoice'][0]['invoiceSummary']['totalNetValue'] = "$total_net_value";
    10091006                $invoice_data['invoice'][0]['invoiceSummary']['totalVatAmount'] = "$total_vat_value";
    … …  
    10181015            $invoice_data['invoice'][0]['invoiceSummary']['totalOtherTaxesAmount'] = 0;
    10191016            $invoice_data['invoice'][0]['invoiceSummary']['totalGrossValue'] = "$total";
    1020             if (($order_country == 'GR' || $order_invoice_type == 'receipt') && $outside_vat != 'yes') {
     1017            if ($outside_vat != 'yes') {
    10211018                $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['classificationCategory'] = $classificationCategory;
    10221019                $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['classificationType'] = $classificationType;
    … …  
    11141111            $invoice_data['invoice'][0]['counterpart']['address']['street'] = $order_address;
    11151112            $invoice_data['invoice'][0]['counterpart']['name'] = $order_billing_company_name;
     1113            $customer_name = $order_billing_company_name;
    11161114        }
    11171115        $invoice_data['invoice'][0]['extra']['showOptionalFields'] = false;
    … …  
    11401138        $invoice_data['invoice'][0]['extra']['customerCode'] = $user_id; // always
    11411139        $invoice_data['invoice'][0]['extra']['customerName'] = $customer_name; // always
    1142         $invoice_data['invoice'][0]['extra']['locationName'] = $shipping_company;
     1140        $invoice_data['invoice'][0]['extra']['locationName'] = "ΕΔΡΑ ΠΕΛΑΤΗ";
    11431141        $invoice_data['invoice'][0]['extra']['locationAddress'] = $shipping_address; // always
    11441142        $invoice_data['invoice'][0]['extra']['locationCity'] = $shipping_city;

  • primer-mydata/trunk/admin/includes/primer-admin-options.php

    r3042613 r3056880  
    34393439        $api_url = $mydata_options['mydata_api'];
    34403440        $api_urls = array();
    3441 
    34423441        switch ($api_url) {
    34433442            case 'test_api':
    3444                 $api_urls[] = 'https://test-mydataapi.ddns.net/v2/invoices/sendData';
    3445                 $url = 'https://test-mydataapi.ddns.net/v2/invoices/sendData';
     3443                $url = 'https://test-mydataapi.primer.gr/v2/invoices/sendData';
    34463444                $api_type = 'test';
    34473445                break;
    34483446            case 'production_api':
    3449                 $api_urls[] = 'https://wp-mydataapi.primer.gr/v2/invoices/sendData';
    34503447                $url = 'https://wp-mydataapi.primer.gr/v2/invoices/sendData';
    34513448                $api_type = 'production';
    34523449                break;
    34533450            default:
    3454                 $api_urls[] = 'https://test-mydataapi.ddns.net/v2/invoices/sendData';
    3455                 $url = 'https://test-mydataapi.ddns.net/v2/invoices/sendData';
     3451                $url = 'https://test-mydataapi.primer.gr/v2/invoices/sendData';
    34563452                $api_type = 'test';
    34573453        }
    3458 
    34593454        $primer_license_data = get_option('primer_licenses');
    34603455        $username = $primer_license_data['username'] ? $primer_license_data['username'] : '';
    … …  
    40894084        $username = $licenses['username'] ? $licenses['username'] : '';
    40904085        $password = $licenses['password'] ? $licenses['password'] : '';
    4091 
    40924086        $auth = base64_encode( "$username" . ':' . "$password" );
    4093         $url = '';
     4087        $url = 'https://wp-mydataapi.primer.gr/v2/config/pluginVersion';
    40944088        $mydata_options = get_option('primer_mydata');
    40954089        $api_type = isset($mydata_options['mydata_api']) ? sanitize_text_field($mydata_options['mydata_api']) : '';
    4096 
    4097         switch ($api_type) {
    4098             case 'test_api':
    4099                 $url = 'https://test-mydataapi.ddns.net/v2/config/pluginVersion';
    4100                 break;
    4101             case 'production_api':
    4102                 $url = 'https://wp-mydataapi.primer.gr/v2/config/pluginVersion';
    4103                 break;
    4104             default:
    4105                 $url = 'https://test-mydataapi.ddns.net/v2/config/pluginVersion';
    4106         }
    4107 
    41084090        $request_args = array(
    41094091            'timeout'       => 0,
    … …  
    41164098            'sslverify'     => false
    41174099        );
    4118 
    41194100        $response = wp_remote_get($url, $request_args);
    4120 
    41214101        $body = wp_remote_retrieve_body( $response );
    4122 
    41234102        return $body;
    41244103
    … …  
    48864865            // Generate PDFs
    48874866            $pdf_content = $this->generate_pdf_content($receipt_id, $use_url_params);
    4888 
    4889             $pdf_file_name = $upload_dir . '/exported_invoices_files/receipt-' . $receipt_id . '.pdf';
     4867            $order_id = get_post_meta($receipt_id, 'order_id_to_receipt', true);
     4868
     4869            $pdf_file_name = $upload_dir . '/exported_invoices_files/receipt-' . $receipt_id . ' for order '.$order_id.'.pdf';
    48904870            file_put_contents($pdf_file_name, $pdf_content);
    48914871

  • primer-mydata/trunk/admin/includes/primer-admin-receipt-table.php

    r3042613 r3056880  
    109109                        $invoice_type_text = __('SALE INVOICE', 'primer');
    110110                    }else{
    111                         $invoice_type_text = __('SERVICE INVOICE', 'primer');
     111                        $invoice_type_text = __('INVOICE', 'primer');
    112112                    }
    113113                }

  • primer-mydata/trunk/includes/class-primer-cron.php

    r3042613 r3056880  
    199199                            'limit' => $limit_automation_orders,
    200200                            'order' => 'DESC',
    201                             'meta_key'     => 'receipt_status', // The postmeta key field
    202                             'meta_value' => 'not_issued', // The comparison argument
     201                            'meta_key'     => 'receipt_status',
     202                            'meta_value' => 'not_issued',
    203203                        );
    204204                        $order_args['status'] = $condition_order_status;

  • primer-mydata/trunk/includes/class-primer.php

    r3042613 r3056880  
    201201        $this->loader->add_filter( 'wp_delete_post', $plugin_admin, 'prevent_order_deletion_callback');
    202202        $this->loader->add_filter('cron_schedules', $plugin_admin, 'intervals');
    203         $this->loader->add_action('woocommerce_new_order', $plugin_admin, 'update_receipt_status_on_order_creation',10,1 );
     203        $this->loader->add_action('woocommerce_new_order', $plugin_admin, 'update_receipt_status_on_order_creation',99,1 );
    204204        add_filter( 'woocommerce_get_wp_query_args', function( $wp_query_args, $query_vars ){
    205205            if ( isset( $query_vars['meta_query'] ) ) {

  • primer-mydata/trunk/includes/template-tags/primer-tags-display-modules.php

    r3042613 r3056880  
    129129            if (!empty($primer_license_data['companyVatNumber'])) {
    130130                if ($order_customer_country == 'GR') {
    131                     $issuer_container .= '<p><span class="issuer_address skin">' . __('ΑΦΜ: ', 'primer') . '' . $primer_license_data['companyVatNumber'] . '</span></p>';
     131                    $issuer_container .= '<p><span class="issuer_address skin">' . __('ΑΦΜ: ', 'primer') . 'EL' . $primer_license_data['companyVatNumber'] . '</span></p>';
    132132                } else {
    133                     $issuer_container .= '<p><span class="issuer_address skin">' . __('VAT: ', 'primer') . '' . $primer_license_data['companyVatNumber'] . '</span></p>';
     133                    $issuer_container .= '<p><span class="issuer_address skin">' . __('VAT: ', 'primer') . 'EL' . $primer_license_data['companyVatNumber'] . '</span></p>';
    134134                }
    135135            } else {
    … …  
    390390                    $product_name = get_the_title($product_id) . " - " . $attributes;
    391391                }
    392             } else {
    393                 $product_name = get_the_title($product_id);
    394392            }
    395393
    … …  
    12511249                $invoice_type_text = __('SALE INVOICE');
    12521250            }else{
    1253                 $invoice_type_text = __('SERVICE INVOICE');
     1251                $invoice_type_text = __('INVOICE');
    12541252            }
    12551253        }

  • primer-mydata/trunk/languages/primer-el.po

    r3022529 r3056880  
    19281928#: admin/includes/primer-admin-receipt-table.php:111
    19291929#: includes/template-tags/primer-tags-display-modules.php:1310
    1930 msgid "SERVICE INVOICE"
    1931 msgstr "SERVICE INVOICE"
     1930msgid "INVOICE"
     1931msgstr "INVOICE"
    19321932
    19331933#: admin/includes/primer-admin-receipt-table.php:228

  • primer-mydata/trunk/primer.php

    r3042613 r3056880  
    1818 * Plugin URI:        primer.gr/plugin/
    1919 * Description:      Issue receipts and invoices with woocommerce.
    20  * Version:           4.1.5
     20 * Version:           4.1.6
    2121 * Author:            Primer Software
    2222 * Author URI:        primer.gr
    … …  
    3636 * Rename this for your plugin and update it as you release new versions.
    3737 */
    38 define( 'PRIMER_VERSION', '4.1.5');
     38define( 'PRIMER_VERSION', '4.1.6');
    3939define( 'PRIMER_NAME', 'Primer MyData' );
    4040

  • primer-mydata/trunk/views/get_order_list.php

    r3022529 r3056880  
    2222                $order = wc_get_order($order->get_parent_id());
    2323            }
    24             if ( empty($order) ) {
     24            if (empty($order)) {
    2525                continue;
    2626            }
    2727            $id_of_order = $order->get_id();
    2828            $receipt_order_status = get_post_meta($id_of_order, 'receipt_status', true);
    29             if (empty($receipt_order_status)) {
     29            if (empty($receipt_order_status)) {
    3030                update_post_meta($id_of_order, 'receipt_status', 'not_issued');
    31             }
     31            }
    3232            $order_country = $order->get_billing_country();
    33             $order_invoice_type = get_post_meta($id_of_order, '_billing_invoice_type', true);
    34             if (is_array($primer_licenses) && (in_array(2, $primer_licenses['wpModules'])) && !in_array(3, $primer_licenses['wpModules']) && !in_array(4, $primer_licenses['wpModules'])) {
    35                 if (($order_invoice_type !== 'primer_invoice' && $order_invoice_type !== 'invoice')) {
     33            $order_invoice_type = get_post_meta($id_of_order, '_billing_invoice_type', true);
     34             if (is_array($primer_licenses)) {
     35            if ((in_array(2, $primer_licenses['wpModules'])) && !in_array(3, $primer_licenses['wpModules']) && !in_array(4, $primer_licenses['wpModules'])) {
     36                if (($order_invoice_type !== 'primer_invoice' && $order_invoice_type !== 'invoice')) {
    3637                    $transmission_failure = get_post_meta($id_of_order, 'transmission_failure_check', true);
    3738                    $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
    … …  
    110111                    $order_count++;
    111112                }
    112             }
    113             elseif (is_array($primer_licenses) && (in_array(3, $primer_licenses['wpModules'])) && !in_array(2, $primer_licenses['wpModules']) && !in_array(4, $primer_licenses['wpModules'])) {
    114                 if (($order_invoice_type == 'primer_invoice' || $order_invoice_type == 'invoice')) {
    115                     //$order_country = $order->get_billing_country();
    116                     if ($order_country == 'GR') {
     113            } elseif (is_array($primer_licenses) && (in_array(3, $primer_licenses['wpModules'])) && !in_array(2, $primer_licenses['wpModules']) && !in_array(4, $primer_licenses['wpModules'])) {
     114                if (($order_invoice_type == 'primer_invoice' || $order_invoice_type == 'invoice')) {
     115                    //$order_country = $order->get_billing_country();
     116                    if ($order_country == 'GR') {
    117117                        $transmission_failure = get_post_meta($id_of_order, 'transmission_failure_check', true);
    118118                        $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
    … …  
    190190                        $order_count++;
    191191                    }
    192                 }
    193             } elseif (is_array($primer_licenses) && in_array(4, $primer_licenses['wpModules']) && !in_array(2, $primer_licenses['wpModules']) && !in_array(3, $primer_licenses['wpModules'])) {
    194                 //$order_country = $order->get_billing_country();
    195                 if ($order_country !== 'GR') {
     192                }
     193            } elseif (is_array($primer_licenses) && in_array(4, $primer_licenses['wpModules']) && !in_array(2, $primer_licenses['wpModules']) && !in_array(3, $primer_licenses['wpModules'])) {
     194                //$order_country = $order->get_billing_country();
     195                if ($order_country !== 'GR') {
    196196                    $transmission_failure = get_post_meta($id_of_order, 'transmission_failure_check', true);
    197197                    $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
    … …  
    270270                    $order_count++;
    271271                }
    272             } elseif (is_array($primer_licenses) && in_array(2, $primer_licenses['wpModules']) && in_array(3, $primer_licenses['wpModules']) && in_array(4, $primer_licenses['wpModules'])) {
     272            } elseif (is_array($primer_licenses) && in_array(2, $primer_licenses['wpModules']) && in_array(3, $primer_licenses['wpModules']) && in_array(4, $primer_licenses['wpModules'])) {
    273273                $transmission_failure = get_post_meta($id_of_order, 'transmission_failure_check', true);
    274                     $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
    275                     if (!empty($order->get_date_paid())) {
    276                         $order_paid_date = date( 'F j, Y', $order->get_date_paid()->getTimestamp());
    277                         $order_paid_hour = date( 'H:i:s', $order->get_date_paid()->getTimestamp());
    278                     } else {
    279                         $order_paid_date = date( 'F j, Y', $order->get_date_created()->getTimestamp());
    280                         $order_paid_hour = date( 'H:i:s', $order->get_date_created()->getTimestamp());
    281                     }
    282                     $order_total_price = $order->get_total();
    283                     $user      = $order->get_user();
    284                     $user_first_name = $order->get_billing_first_name();
    285                     $user_last_name = $order->get_billing_last_name();
    286                     $user_full_name = $user_first_name . ' ' . $user_last_name;
    287                     $currency      = $order->get_currency();
    288                     $currency_symbol = get_woocommerce_currency_symbol( $currency );
    289                     $payment_title = $order->get_payment_method_title();
    290                     $order_status = $order->get_status();
    291                     $receipt_date = '';
    292                     $credit_receipt_date = '';
    293                     $exist_credit_id = '';
    294                     $exist_receipt_id = get_order_from_receipt($id_of_order);
    295                     $exist_credit = get_post_meta($id_of_order,'cancelled',true);
    296                     if (!empty($exist_credit)) {
    297                         $credit_receipt_date = 'CANCELLED';
    298                         $exist_credit_id = get_order_from_receipt($id_of_order);
    299                     }
    300                     if (!empty($exist_receipt_id)) {
    301                         $receipt_date = get_the_date('F j, Y', $exist_receipt_id[0]);
    302                     }
    303                     $log_for_order = get_post_meta($id_of_order, 'log_id_for_order', true);
    304                     if (!empty($log_for_order)) {
    305                         $log_type = get_post_type($log_for_order);
    306                         if ($log_type == 'pr_log_automation') {
    307                             $receipt_status_from_meta_url = admin_url('admin.php?page=primer_receipts_logs_automation');
    308                         } else {
    309                             $receipt_status_from_meta_url = admin_url('admin.php?page=primer_receipts_logs');
    310                         }
    311                         $receipt_status_from_meta_url = $receipt_status_from_meta_url . '&order_log=' . $log_for_order;
    312                     } else {
    313                         $receipt_status_from_meta_url = '';
    314                     }
    315                     $transmission_failure_message='';
    316                     if($transmission_failure == 1 || $transmission_failure == 3){
    317                         $transmission_failure_message = 'Αδυναμία σύνδεσης';
    318                     }else if($transmission_failure == 2){
    319                         $transmission_failure_message = 'Επιτυχής Αποστολή';
    320                     }else if($transmission_failure == 4){
    321                         $transmission_failure_message = 'Αδυναμία Αποστολής HTML';
    322                     }
    323                     $this->orders_array[$order_count]['order_id'] = $id_of_order;
    324                     $this->orders_array[$order_count]['order_date'] = $order_paid_date;
    325                     $this->orders_array[$order_count]['order_hour'] = $order_paid_hour;
    326                     $this->orders_array[$order_count]['order_client'] = $user ? $user->display_name : $user_full_name;
    327                     $this->orders_array[$order_count]['order_price'] = $order_total_price . ' ' .$currency_symbol;
    328                     $this->orders_array[$order_count]['order_status'] = $order_status;
    329                     $this->orders_array[$order_count]['transmission_failure'] = $transmission_failure_message;
    330                     $this->orders_array[$order_count]['accept_48'] = $failed_48;
    331                     $this->orders_array[$order_count]['payment_status'] = $payment_title;
    332                     $this->orders_array[$order_count]['receipt_date'] = $receipt_date;
    333                     $this->orders_array[$order_count]['credit_receipt_date'] = $credit_receipt_date; //CANCELLED
    334                     $this->orders_array[$order_count]['receipt_status'] = $receipt_status_from_meta_url;
    335                     $this->orders_array[$order_count]['receipt_id'] = $exist_receipt_id ? $exist_receipt_id[0] : '';
    336                     $this->orders_array[$order_count]['credit_receipt_id'] = $exist_credit_id ? $exist_credit_id[0] : '';
    337                 $order_count++;
    338             }
    339             elseif (is_array($primer_licenses) && in_array(2, $primer_licenses['wpModules']) && in_array(3, $primer_licenses['wpModules']) && !in_array(4, $primer_licenses['wpModules'])) {
    340                 //$order_country = $order->get_billing_country();
    341                 if ($order_country == 'GR') {
     274                $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
     275                if (!empty($order->get_date_paid())) {
     276                    $order_paid_date = date('F j, Y', $order->get_date_paid()->getTimestamp());
     277                    $order_paid_hour = date('H:i:s', $order->get_date_paid()->getTimestamp());
     278                } else {
     279                    $order_paid_date = date('F j, Y', $order->get_date_created()->getTimestamp());
     280                    $order_paid_hour = date('H:i:s', $order->get_date_created()->getTimestamp());
     281                }
     282                $order_total_price = $order->get_total();
     283                $user = $order->get_user();
     284                $user_first_name = $order->get_billing_first_name();
     285                $user_last_name = $order->get_billing_last_name();
     286                $user_full_name = $user_first_name . ' ' . $user_last_name;
     287                $currency = $order->get_currency();
     288                $currency_symbol = get_woocommerce_currency_symbol($currency);
     289                $payment_title = $order->get_payment_method_title();
     290                $order_status = $order->get_status();
     291                $receipt_date = '';
     292                $credit_receipt_date = '';
     293                $exist_credit_id = '';
     294                $exist_receipt_id = get_order_from_receipt($id_of_order);
     295                $exist_credit = get_post_meta($id_of_order, 'cancelled', true);
     296                if (!empty($exist_credit)) {
     297                    $credit_receipt_date = 'CANCELLED';
     298                    $exist_credit_id = get_order_from_receipt($id_of_order);
     299                }
     300                if (!empty($exist_receipt_id)) {
     301                    $receipt_date = get_the_date('F j, Y', $exist_receipt_id[0]);
     302                }
     303                $log_for_order = get_post_meta($id_of_order, 'log_id_for_order', true);
     304                if (!empty($log_for_order)) {
     305                    $log_type = get_post_type($log_for_order);
     306                    if ($log_type == 'pr_log_automation') {
     307                        $receipt_status_from_meta_url = admin_url('admin.php?page=primer_receipts_logs_automation');
     308                    } else {
     309                        $receipt_status_from_meta_url = admin_url('admin.php?page=primer_receipts_logs');
     310                    }
     311                    $receipt_status_from_meta_url = $receipt_status_from_meta_url . '&order_log=' . $log_for_order;
     312                } else {
     313                    $receipt_status_from_meta_url = '';
     314                }
     315                $transmission_failure_message = '';
     316                if ($transmission_failure == 1 || $transmission_failure == 3) {
     317                    $transmission_failure_message = 'Αδυναμία σύνδεσης';
     318                } else if ($transmission_failure == 2) {
     319                    $transmission_failure_message = 'Επιτυχής Αποστολή';
     320                } else if ($transmission_failure == 4) {
     321                    $transmission_failure_message = 'Αδυναμία Αποστολής HTML';
     322                }
     323                $this->orders_array[$order_count]['order_id'] = $id_of_order;
     324                $this->orders_array[$order_count]['order_date'] = $order_paid_date;
     325                $this->orders_array[$order_count]['order_hour'] = $order_paid_hour;
     326                $this->orders_array[$order_count]['order_client'] = $user ? $user->display_name : $user_full_name;
     327                $this->orders_array[$order_count]['order_price'] = $order_total_price . ' ' . $currency_symbol;
     328                $this->orders_array[$order_count]['order_status'] = $order_status;
     329                $this->orders_array[$order_count]['transmission_failure'] = $transmission_failure_message;
     330                $this->orders_array[$order_count]['accept_48'] = $failed_48;
     331                $this->orders_array[$order_count]['payment_status'] = $payment_title;
     332                $this->orders_array[$order_count]['receipt_date'] = $receipt_date;
     333                $this->orders_array[$order_count]['credit_receipt_date'] = $credit_receipt_date; //CANCELLED
     334                $this->orders_array[$order_count]['receipt_status'] = $receipt_status_from_meta_url;
     335                $this->orders_array[$order_count]['receipt_id'] = $exist_receipt_id ? $exist_receipt_id[0] : '';
     336                $this->orders_array[$order_count]['credit_receipt_id'] = $exist_credit_id ? $exist_credit_id[0] : '';
     337                $order_count++;
     338            } elseif (is_array($primer_licenses) && in_array(2, $primer_licenses['wpModules']) && in_array(3, $primer_licenses['wpModules']) && !in_array(4, $primer_licenses['wpModules'])) {
     339                //$order_country = $order->get_billing_country();
     340                if ($order_country == 'GR') {
    342341                    $transmission_failure = get_post_meta($id_of_order, 'transmission_failure_check', true);
    343342                    $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
    … …  
    424423                    $order_count++;
    425424                }
    426             }
    427             elseif (is_array($primer_licenses) && in_array(2, $primer_licenses['wpModules']) && in_array(4, $primer_licenses['wpModules']) && !in_array(3, $primer_licenses['wpModules'])) {
    428                 //$order_country = $order->get_billing_country();
    429                 if ($order_country == 'GR' && $order_invoice_type !== 'invoice') {
     425            } elseif (is_array($primer_licenses) && in_array(2, $primer_licenses['wpModules']) && in_array(4, $primer_licenses['wpModules']) && !in_array(3, $primer_licenses['wpModules'])) {
     426                //$order_country = $order->get_billing_country();
     427                if ($order_country == 'GR' && $order_invoice_type !== 'invoice') {
    430428                    $transmission_failure = get_post_meta($id_of_order, 'transmission_failure_check', true);
    431429                    $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
    … …  
    507505                    $order_count++;
    508506                }
    509             }
    510             elseif(is_array($primer_licenses) && in_array(3, $primer_licenses['wpModules']) && in_array(4, $primer_licenses['wpModules']) && !in_array(2, $primer_licenses['wpModules'])) {
    511                 //$order_country = $order->get_billing_country();
    512                 if (($order_country == 'GR' && $order_invoice_type !== 'receipt') || ($order_country !== 'GR')) {
     507            } elseif (is_array($primer_licenses) && in_array(3, $primer_licenses['wpModules']) && in_array(4, $primer_licenses['wpModules']) && !in_array(2, $primer_licenses['wpModules'])) {
     508                //$order_country = $order->get_billing_country();
     509                if (($order_country == 'GR' && $order_invoice_type !== 'receipt') || ($order_country !== 'GR')) {
    513510                    $transmission_failure = get_post_meta($id_of_order, 'transmission_failure_check', true);
    514511                    $failed_48 = get_post_meta($id_of_order, 'failed_48', true);
    … …  
    588585                    $order_count++;
    589586                }
    590             }
     587            }
     588        }
    591589        }
    592590        return $this->orders_array;
Note: See TracChangeset for help on using the changeset viewer.