Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2848352

Timestamp:

01/14/2023 10:02:39 AM (3 years ago)

Author:

primersoftware

Message:

Update

Location:

primer-mydata

Files:

: 2326 added
: 13 edited

Legend:

: Unmodified
: Added
: Removed

primer-mydata/trunk/README.txt

-                      r2823401
+                      r2848352
 Tested up to: 6.1.1
 Requires PHP: 7.4
 Stable tag: 2.0.7
+Stable tag: 2.0.8
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 …
 = 2.0.6 - 2022-11-23 =
 * Minor Bug Fixes
+= 2.0.6 - 2022-11-24 =
+* Minor Bug Fixes
+= 2.0.8 - 2022-11-23 =
+* Minor Bug Fixes for php 8.0 version
+* Now you can search with order Id or document Number in Receipts Page
+* Now you can issue receipts/invcoices even if the products are deleted completely
+* From now on new receipts/invoices can also be filter by document type (Receipt, Invoice, Credit Receipt, Credit Invoice)

primer-mydata/trunk/admin/class-primer-admin.php

r2822848	r2848352
97	97	wp_enqueue_style('primer-jquery-ui');
98	98	wp_enqueue_script('jquery-ui-datepicker');
99		~~//wp_enqueue_script('cmb2-conditional', PRIMER_URL . '/includes/vendor/conditional/cmb2-conditionals.js');~~
100
101	99	//Bootstrap select
102	100	$screen = get_current_screen();

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

-                      r2822848
+                      r2848352
     public function __construct() {
         add_action('admin_menu', array(&$this, 'menu'));
         add_filter('show_admin_bar', array(&$this, 'hide_adminbar'));
-//      add_action('save_post', array(&$this, 'save_postdata'));
-//      add_action( 'admin_init', array( $this, 'init' ), 999 );
-        //init is too early for settings api.
         add_action('plugins_loaded', array(&$this, "plugins_loaded"));
         add_action('wp_print_scripts', array(&$this, 'data_include_script'));
         add_action('wp_ajax_create_primer_the_zip_file', array(&$this, 'create_primer_the_zip_file'));
 …
         add_action('wp_ajax_primer_resend_receipt_to_customer', array(&$this, 'primer_resend_receipt_to_customer'));
         add_action('wp_ajax_primer_cancel_invoice', array(&$this, 'primer_cancel_invoice'));
         add_action('wp_ajax_primer_smtp_settings', array(&$this, 'primer_smtp_settings'));
         add_action('wp_ajax_primer_system_settings', array(&$this, 'primer_system_settings'));
         add_action('wp_ajax_primer_insert_license', array(&$this, 'primer_insert_license'));
         add_action('wp_ajax_first_time_act', array(&$this, 'first_time_act'));
         add_action('wp_ajax_primer_get_series', array(&$this, 'primer_get_series'));
         add_action('wp_ajax_company_activation_call', array(&$this, 'company_activation_call'));
         add_action('wp_ajax_primer_license_remaining', array(&$this, 'primer_license_remaining'));
         add_action('wp_ajax_primer_user_picture_upload', array(&$this, 'primer_user_picture_upload'));
-        /*// add_action('wp_footer', array($this, 'primer_timologio_for_wc_aade_fill'));
-        add_action('wp_ajax_primer_timologio_for_wc_aade_fill',array(&$this, 'primer_timologio_for_wc_aade_fill'));
-        add_action('wp_ajax_nopriv_primer_timologio_for_wc_aade_fill',array(&$this, 'primer_timologio_for_wc_aade_fill'));
-        add_action('wp_ajax_primer_check_for_valid_vat_aade', array(&$this,'primer_check_for_valid_vat_aade'));
-        add_action('wp_ajax_primer_check_for_valid_vat_aade', array(&$this,'primer_check_for_valid_vat_aade'));*/
         $this->menu_title = __( 'Primer MyData', 'primer' );
+    }
 …
             $this->options_pages[] = add_submenu_page('wp_ajax_list_order', __('License and General Settings', 'primer'), __('License and General Settings', 'primer'), 'manage_options', 'primer_licenses', array(&$this, "admin_settings_page_display"));
             $this->options_pages[] = add_submenu_page(null, $this->menu_title, 'General Settings', 'manage_options', 'primer_generals', array( $this, 'admin_settings_page_display' ));
             $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'MyData Settings', 'manage_options', 'primer_mydata', array( $this, 'admin_settings_page_display' ));
             $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'Automation Settings', 'manage_options', 'primer_automation', array( $this, 'admin_settings_page_display' ));
             $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'Email Settings', 'manage_options', 'primer_email', array( $this, 'admin_settings_page_display' ));
-           // $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'Instructions', 'manage_options', 'primer_instructions', array( $this, 'admin_settings_page_display' ));
         } else {
             if (is_array($primer_license_data) && $primer_license_data['mistake_license'] == 'fail') {
                 add_menu_page(__('Primer Receipts', 'primer'), __('Primer Receipts', 'primer'), 'manage_options', 'wp_ajax_list_order', array(&$this, "admin_page_display"), 'dashicons-printer');
-//              add_submenu_page('wp_ajax_list_order', __('Export', 'primer'), __('Export', 'primer'), 'manage_options', 'primer_export', array(&$this, "admin_settings_page_display"));
                 $this->options_pages[] = add_submenu_page('wp_ajax_list_order', __('License and General Settings', 'primer'), __('License and General Settings', 'primer'), 'manage_options', 'primer_licenses', array(&$this, "admin_settings_page_display"));
                 $this->options_pages[] = add_submenu_page(null, $this->menu_title, 'General Settings', 'manage_options', 'primer_generals', array( $this, 'admin_settings_page_display' ));
                 $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'MyData Settings', 'manage_options', 'primer_mydata', array( $this, 'admin_settings_page_display' ));
                 $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'Automation Settings', 'manage_options', 'primer_automation', array( $this, 'admin_settings_page_display' ));
                 $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'Email Settings', 'manage_options', 'primer_email', array( $this, 'admin_settings_page_display' ));
-               // $this->options_pages[] = add_submenu_page('wp_ajax_list_order', __('Instructions', 'primer'), __('Instructions', 'primer'), 'manage_options', 'primer_instructions', array(&$this, "admin_settings_page_display"));
             } else {
                 add_menu_page(__('Primer Receipts', 'primer'), __('Primer Receipts', 'primer'), 'manage_options', 'wp_ajax_list_order', array(&$this, "admin_page_display"), 'dashicons-printer');
 …
                     add_submenu_page('wp_ajax_list_order', __('Receipts', 'primer'), __('Receipts', 'primer'), 'manage_options', 'primer_receipts', array(&$this, "admin_page_receipt_display"));
+                }
                 add_submenu_page(null, __('Receipts Logs', 'primer'), __('Receipts Logs', 'primer'), 'manage_options', 'primer_receipts_logs', array(&$this, "admin_page_receipt_log_display"));
                 add_submenu_page(null, __('Automation Logs', 'primer'), __('Automation Logs', 'primer'), 'manage_options', 'primer_receipts_logs_automation', array(&$this, "admin_page_receipt_log_automation_display"));
                 add_submenu_page('wp_ajax_list_order', __('Settings', 'primer'), __('Settings', 'primer'), 'manage_options', 'primer_settings', array(&$this, "admin_settings_page_display"));
-//              add_submenu_page('wp_ajax_list_order', __('Export', 'primer'), __('Export', 'primer'), 'manage_options', 'primer_export', array(&$this, "admin_settings_page_display"));
                 $this->options_pages[] = add_submenu_page('wp_ajax_list_order', __('License and General Settings', 'primer'), __('License and General Settings', 'primer'), 'manage_options', 'primer_licenses', array(&$this, "admin_settings_page_display"));
                 $this->options_pages[] = add_submenu_page(null, $this->menu_title, 'General Settings', 'manage_options', 'primer_generals', array( $this, 'admin_settings_page_display' ));
                 if (!empty($primer_license_data['wpModules']) && in_array(7, $primer_license_data['wpModules'])) {
                     $this->options_pages[] = add_submenu_page( null,  $this->menu_title, 'MyData Settings', 'manage_options', 'primer_mydata', array( $this, 'admin_settings_page_display' ));
 …
                     foreach ( $order->get_items() as $item_id => $item_data ) {
                         $product_id = $item_data->get_product_id();
                         $product_instance = wc_get_product($product_id);
                         $product_name = $product_instance->get_name();
+                        //$product_instance = wc_get_product($product_id);
+                        $product_name = $item_data->get_name();
+                    }
+                }
 …
                         $sum += $quantity;
                         $product_id = $item_data->get_product_id();
                         $product_instance = wc_get_product($product_id);
                         $product_name = $product_instance->get_name();
                         $product_tax_class = $product_instance->get_tax_class();
+                        //$product_id = $item_data->get_product_id();
+                        //$product_instance = wc_get_product($product_id);
+                        //$product_name = $product_instance->get_name();
+                        $product_tax_class = $item_data->get_tax_class();
                         $taxes = WC_Tax::get_rates_for_tax_class( $product_tax_class );
 …
+                }
                 if (!empty($product_id)) {
+                if (!empty($item_data)) {
                     $this->receipt_product_vat_amount[$inside_tax_rate] = $inside_tax_rate;
+                }
 …
                     foreach ( $order->get_items() as $item_id => $item_data ) {
                         $product_id = $item_data->get_product_id();
                         $product_instance = wc_get_product($product_id);
                         $product_name = $product_instance->get_name();
                         $regular_price = $product_instance->get_regular_price();
+                    //  $product_instance = wc_get_product($product_id);
+                        $product_name = $item_data->get_name();
+                        $regular_price = $item_data->get_regular_price();
+                    }
+                }
 …
                     foreach ( $order->get_items() as $item_id => $item_data ) {
                         $product_id = $item_data->get_product_id();
                         $product_instance = wc_get_product($product_id);
                         $product_name = $product_instance->get_name();
                         $regular_price = $product_instance->get_regular_price();
+                        //$product_instance = wc_get_product($product_id);
+                        $product_name = $item_data->get_name();
+                        $regular_price = $item_data->get_regular_price();
                         $subtotal_order_payment = $item_data->get_subtotal();
+                    }
 …
                             $quantity = $item_data->get_quantity();
                             $sum += $quantity;
                             $product_id = $item_data->get_product_id();
+                          /*  $product_id = $item_data->get_product_id();
                             $product_instance = wc_get_product($product_id);
                             if($product_instance == null){
 …
                                 update_post_meta($receipt_log_id, 'receipt_log_error', $receipt_log_value);
                                 break 2;
+                            }
+                            } */
                             if (!empty($get_coupon)) {
                                 $subtotal_order_payment = $item_data->get_total();
 …
+                            }
                             $product_tax_class = $product_instance->get_tax_class();
+                            $product_tax_class = $item_data->get_tax_class();
                             $taxes = WC_Tax::get_rates_for_tax_class( $product_tax_class );
                             $tax_arr = json_decode(json_encode($taxes), true);
 …
                         $invoice_data['invoice'][0]['invoiceSummary']['totalOtherTaxesAmount'] = 0;
                         $invoice_data['invoice'][0]['invoiceSummary']['totalGrossValue'] = "$total";
                         if($order_country == 'GR' || $order_invoice_type == 'receipt') {
+                        if(($order_country == 'GR' || $order_invoice_type == 'receipt') && $outside_vat != 'yes') {
                             $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['classificationCategory'] = $classificationCategory;
                             $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['classificationType'] = $classificationType;
 …
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['classificationType'] = "E3_562";
                                 if($fee_total >0){
                                     $shipping_total = $shipping_total+$fee_total;
                                     $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$shipping_total";
+                                $shipping_total = $shipping_total+$fee_total;
+                                $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$shipping_total";
                                 }else{
                                     $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$shipping_total";
+                                $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$shipping_total";
+                                }
                             }else if($fee_total >0){
 …
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$fee_net_value";
                             }else{
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['amount'] = "$subtotal";
+                            $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['amount'] = "$subtotal";
+                            }
                             $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['id'] = "1";
                         } else {
-                            $shipping_total_unformatted = $order->get_shipping_total();
                             $amount_class = $total - $total_tax - $fee_net_value - $shipping_total;
                             $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['classificationCategory'] = $classificationCategory;
 …
                             $total_counter = 1;
                             if($total_tax != 0){
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][$total_counter]['classificationCategory'] = $classificationCategory_en;
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][$total_counter]['amount'] = "$total_tax";
                                 $total_counter = 2;
+                            $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][$total_counter]['classificationCategory'] = $classificationCategory_en;
+                            $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][$total_counter]['amount'] = "$total_tax";
+                            $total_counter = 2;
+                            }
                             if($shipping_total > 0){
 …
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][$total_counter]['classificationType'] = "E3_562";
                                 if($fee_total = 0){
                                     $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][$total_counter]['amount'] = "$shipping_total";
+                                $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][$total_counter]['amount'] = "$shipping_total";
                                 }else{
                                     $ship_and_fee = $fee_net_value + $shipping_total;
 …
                                         update_post_meta($post_id, 'credit_success_mydata_date', $invoice_date);
                                         update_post_meta($post_id, 'credit_success_mydata_time', $invoice_time);
+                                        update_post_meta($post_id, 'receipt_type', $invoice_term);
                                         update_post_meta($post_id, 'send_to_api_type', $api_type);
                                         if ($api_type == 'test') {
 …
                                         update_post_meta($post_id, 'credit_success_mydata_date', $invoice_date);
                                         update_post_meta($post_id, 'credit_success_mydata_time', $invoice_time);
+                                        update_post_meta($post_id, 'receipt_type', $invoice_term);
                                         update_post_meta($post_id, 'send_to_api_type', $api_type);
                                         if ($api_type == 'test') {
 …
+    }
+    public function get_alpha_char() {
+    public function get_alpha_char(): array
+    {
         $alpha_chars = array();
         $alpha_chars[''] = __('Select', 'primer');

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

-                      r2812297
+                      r2848352
         return array();
+    }
+    public function display() {
+        //  echo '<form id="wc-orders-filter" method="get" action="' . esc_url( get_admin_url( null, 'admin.php' ) ) . '">';
+        $this->search_box( esc_html__( 'Search  by order id or number of invoice', 'primer' ), 'filter_action' );
+        parent::display();
+        //  echo '</form> </div>';
+    }
     function column_default( $item, $column_name ) {
 …
                             </select>
                         </div>
+                        <div class="filter_block">
+                            <label for="primer_receipt_type" style="float: left;"><?php _e('Invoice Type: ', 'primer'); ?></label>
+                            <select name="primer_receipt_type" title="<?php _e('Select invoice type', 'primer'); ?>" id="primer_receipt_type">
+                                <?php
+                                $get_type = isset($_GET['primer_receipt_type']) ? sanitize_text_field($_GET['primer_receipt_type']) : '';
+                                $type_of_receipts = array(
+                                    '' => 'All',
+                                    'receipt' => 'Receipt',
+                                    'invoice' => 'Invoice',
+                                    'credit-receipt' => 'Credit Receipt',
+                                    'credit-invoice' => 'Credit Invoice'
+                                );
+                                foreach ( $type_of_receipts as $status_k => $status_value ) { ?>
+                                    <option value="<?php echo esc_attr($status_k); ?>" <?php selected($status_k, $get_type); ?>><?php echo esc_attr($status_value); ?></option>
+                                <?php }
+                                ?>
+                            </select>
+                        </div>
                         <div class="apply_btn"><input type="submit" class="button" name="filter_action" value="<?php _e('Apply filter', 'primer'); ?>" /></div>
 …
     function prepare_items() {
         $per_page = 20;
+        $current_page = $this->get_pagenum();
         $get_total_receipts = new PrimerReceiptList();
         if (isset($_GET['primer_receipt_status']) || isset($_GET['primer_receipt_client']) || isset($_GET['receipt_date_from']) || isset($_GET['receipt_date_to'])) {
             $get_receipts_list = $get_total_receipts->get_with_params($_GET['receipt_date_from'], $_GET['receipt_date_to'], $_GET['primer_receipt_client'], $_GET['primer_receipt_status']);
+        if (isset($_GET['primer_receipt_status']) || isset($_GET['primer_receipt_client']) || isset($_GET['primer_receipt_type']) || isset($_GET['receipt_date_from']) || isset($_GET['receipt_date_to']) || (isset($_GET['s']) && !empty($_GET['s']) )) {
+            $get_receipts_list = $get_total_receipts->get_with_params($current_page, $_GET['receipt_date_from'], $_GET['receipt_date_to'], $_GET['primer_receipt_client'], $_GET['primer_receipt_status'], $_GET['primer_receipt_type']);
         } else {
             $get_receipts_list = $get_total_receipts->get();
+            $get_receipts_list = $get_total_receipts->get($current_page);
+        }
 …
          * Get current page calling get_pagenum method
          */
+        $current_page = $this->get_pagenum();
+        $total_items = count($data);
+        $data = array_slice($data,(($current_page-1)*$per_page),$per_page);
+        $total_items = array_sum( (array) wp_count_posts( 'primer_receipt' ) );
         $this->items = $data;
         /**
          * Call to _set_pagination_args method for informations about

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

-                      r2822848
+                      r2848352
             $get_orders_list = $get_total_orders->get($current_page);
+        }
         $columns  = $this->get_columns();
         $hidden   = $this->hidden_columns;
         $sortable = $this->get_sortable_columns();
         $this->_column_headers = array( $columns, $hidden, $sortable );
         $this->items = $get_orders_list;
         $data = $this->items;
         /**
          * Get current page calling get_pagenum method
          */
         $current_page = $this->get_pagenum();
-        //$total_items = count($get_orders_list);
        $total_items = array_sum( (array) wp_count_posts( 'shop_order' ) );
-        //$data = array_slice($data,(($current_page-1)*$per_page),$per_page);
         $this->items = $data;
         /**
          * Call to _set_pagination_args method for informations about
 …
         );
+    }
-    /*function display() {
-        wp_nonce_field( 'ajax-order-list-nonce', '_ajax_order_list_nonce' );
-        parent::display();
-    }*/
     function no_items() {
 …
             break;
         case 'production_api':
             $api_urls[] = 'https://wp-mydataapi.primer.gr/v2/invoices/send';
             $url = 'https://wp-mydataapi.primer.gr/v2/invoices/send';
+            $api_urls[] = 'https://https://wp-mydataapi.primer.gr/v2/invoices/send';
+            $url = 'https://https://wp-mydataapi.primer.gr/v2/invoices/send';
             $api_type = 'production';
             break;
 …
             if ($ret_code !== 502) {
                 $url = $item_url;
                 $url_slug = 'https://wp-mydataapi.primer.gr';
+                $url_slug = 'https://https://wp-mydataapi.primer.gr';
             } else {
                 $url = 'https://backup-mydataapi.ddns.net/v2/invoices/send';
 …
                             $quantity = $item_data->get_quantity();
                             $sum += $quantity;
                             $product_id = $item_data->get_product_id();
+                           /* $product_id = $item_data->get_product_id();
                             $product_instance = wc_get_product($product_id);
                               if($product_instance == null){
 …
                             update_post_meta($receipt_log_id, 'receipt_log_error', $receipt_log_value);
                             break 2;
+                            }
+                            } */
                             if (!empty($get_coupon)) {
 …
                                 continue;
+                            }
+                            $product_tax_class = $product_instance->get_tax_class();
+                            $product_tax_class = $item_data->get_tax_class();
                             $taxes = WC_Tax::get_rates_for_tax_class( $product_tax_class );
                             $tax_arr = json_decode(json_encode($taxes), true);
 …
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['classificationType'] = "E3_562";
                                 if($fee_total >0){
                                     $shipping_total = $shipping_total+$fee_total;
                                     $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$shipping_total";
+                                $shipping_total = $shipping_total+$fee_total;
+                                $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$shipping_total";
                                 }else{
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['amount'] = "$shipping_total";
 …
                             }else if($fee_total >0){
                                 $total_for_product = $subtotal - $fee_total;
                             $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['amount'] = "$total_for_product";
+                                $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][0]['amount'] = "$total_for_product";
                                 $invoice_data['invoice'][0]['invoiceSummary']['totalGrossValue'] = "$order_total_price";
                                 $invoice_data['invoice'][0]['invoiceSummary']['incomeClassification'][1]['classificationCategory'] = "category1_5";
 …
                                 update_post_meta($post_id, 'success_mydata_date', $invoice_date);
                                 update_post_meta($post_id, 'success_mydata_time', $invoice_time);
+                                update_post_meta($post_id, 'receipt_type', $invoice_term);
                                 update_post_meta($post_id, 'send_to_api_type', $api_type);
                                 if ($api_type == 'test') {
 …
                                 update_post_meta($post_id, 'success_mydata_date', $invoice_date);
                                 update_post_meta($post_id, 'success_mydata_time', $invoice_time);
+                                update_post_meta($post_id, 'receipt_type', $invoice_term);
                                 update_post_meta($post_id, 'send_to_api_type', $api_type);
                                 if ($api_type == 'test') {

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

-                      r2812297
+                      r2848352
         );
+        $wp_version = $wp_version;
+        $php_version = phpversion();
+        $php_version = phpversion();
         $extensions = get_loaded_extensions();
         $curl = in_array('curl', $extensions);
 …
         set_transient( 'primer_activation_warning', $error, 5 );
+        $orders       = wc_get_orders(array(
+            'date_created' => '>' . '01-01-2022',
+            'limit' => 1000
+        ));
+        foreach ( $orders as $order ) {
+            if (is_a($order, 'WC_Order_Refund')) {
+                $order = wc_get_order($order->get_parent_id());
+            }
+            $order_id = $order->get_id();
+            $receipt_order_status = get_post_meta($order_id, 'receipt_status', true);
+            if (empty($receipt_order_status)) {
+                update_post_meta($order_id, 'receipt_status', 'not_issued');
+            }
+        }
         /**
 …
         // Done
         do_action( 'primer_activated' );
+    //  do_action( 'primer_activated' );
+    }

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

-                      r2822848
+                      r2848352
                             'return' => 'ids',
                             'limit' => $limit_automation_orders,
+                            'order' => 'DESC'
+                            'order' => 'DESC',
+                            'meta_key'     => 'receipt_status', // The postmeta key field
+                            'meta_value' => 'not_issued', // The comparison argument
                         );
 …
                         $mydata_options['already_running_orders'] = count($orders) * 5;
                         update_option('primer_mydata', $mydata_options);
+                        array_map( 'sanitize_text_field', $orders );
                         foreach ($orders as $order_id) {
                             $invoice_data = array(
 …
                                             $quantity = $item_data->get_quantity();
                                             $sum += $quantity;
                                             $product_id = $item_data->get_product_id();
+                                           /* $product_id = $item_data->get_product_id();
                                             $product_instance = wc_get_product($product_id);
                                             if($product_instance == null){
 …
                                                 update_post_meta($receipt_log_id, 'receipt_log_error', $receipt_log_value);
                                                 break 2;
+                                            }
+                                            } */
                                             if (!empty($get_coupon)) {
                                                 $subtotal_order_payment = $item_data->get_total();
 …
+                                            }
                                             $product_tax_class = $product_instance->get_tax_class();
+                                            $product_tax_class = $item_data->get_tax_class();
                                             $taxes = WC_Tax::get_rates_for_tax_class($product_tax_class);
                                             $tax_arr = json_decode(json_encode($taxes), true);
 …
                                                         update_post_meta($post_id, 'success_mydata_date', $invoice_date);
                                                         update_post_meta($post_id, 'success_mydata_time', $invoice_time);
+                                                        update_post_meta($post_id, 'receipt_type', $invoice_term);
                                                         update_post_meta($post_id, 'send_to_api_type', $api_type);
                                                         if ($api_type == 'test') {
 …
                                                     $args = array(
                                                         'method'        => 'POST',
+                                                        'timeout'       => 30,
                                                         'headers'       => array(
                                                             'Authorization' => 'Basic ' . base64_encode( $username.':'.$password ),
 …
                                                             $response_data = '<div class="notice notice-success"><p>' . __('Orders converted', 'primer') . '</p></div>';
                                                         } else {
                                                             $mydata_options['last_request'] = $order_ids;
+                                                            $mydata_options['last_request'] = $orders;
                                                             update_option('primer_mydata', $mydata_options);
                                                             update_post_meta($id_of_order, 'receipt_status', 'not_issued');
 …
                                                         $response_data .= '<div class="notice notice-error"><p>' . __('Conversion failed! Because AADE return null uid,auth code,mark.Please contact technical support.', 'primer') . '</p></div>';
                                                         $receipt_log_value_array[] = __('HTML Response is empty', 'primer');
                                                         $mydata_options['last_request'] = $order_ids;
+                                                        $mydata_options['last_request'] = $orders;
                                                         update_post_meta($id_of_order, 'receipt_status', 'not_issued');
                                                         update_post_meta($id_of_order, 'transmission_failure_check', 4);
 …
                                                         update_post_meta($post_id, 'success_mydata_time', $invoice_time);
                                                         update_post_meta($post_id, 'send_to_api_type', $api_type);
+                                                        update_post_meta($post_id, 'receipt_type', $invoice_term);
                                                         if ($api_type == 'test') {
                                                             $url_slug = 'https://test-mydataapi.ddns.net';
 …
                                                             $response_data = '<div class="notice notice-success"><p>' . __("Orders converted", "primer") . '</p></div>';
                                                         } else {
                                                             $mydata_options['last_request'] = $order_ids;
+                                                            $mydata_options['last_request'] = $orders;
                                                             update_post_meta($id_of_order, 'receipt_status', 'not_issued');
                                                             update_post_meta($id_of_order, 'transmission_failure_check', 4);
 …
+                                                        }
                                                     } else {
                                                         $mydata_options['last_request'] = $order_ids;
+                                                        $mydata_options['last_request'] = $orders;
                                                         update_post_meta($id_of_order, 'receipt_status', 'not_issued');
                                                         update_post_meta($id_of_order, 'transmission_failure_check', 4);
 …
+                                                    }
                                                 } else {
                                                     $mydata_options['last_request'] = $order_ids;
+                                                    $mydata_options['last_request'] = $orders;
                                                     update_post_meta($id_of_order, 'receipt_status', 'not_issued');
                                                     update_post_meta($id_of_order, 'transmission_failure_check', 4);
 …
+                                                }
                                                 } else {
                                                     $mydata_options['last_request'] = $order_ids;
+                                                    $mydata_options['last_request'] = $orders;
                                                     if (!empty($url_slug)) {
                                                         $mydata_options['last_request_url'] = $url_slug;
 …
+                    }
                     foreach ($order->get_items() as $item_id => $item_data) {
                         $product_id = $item_data->get_product_id();
                         $product_instance = wc_get_product($product_id);
                         $product_tax_class = $product_instance->get_tax_class();
+                      //  $product_id = $item_data->get_product_id();
+                       // $product_instance = wc_get_product($product_id);
+                        $product_tax_class = $item_data->get_tax_class();
                         $taxes = WC_Tax::get_rates_for_tax_class($product_tax_class);
 …
                                 $sum += $quantity;
                                 $count_products = count($order->get_items());
                                 $product_id = $item_data->get_product_id();
+                               /* $product_id = $item_data->get_product_id();
                                 $product_instance = wc_get_product($product_id);
                                 if($product_instance == null){
 …
                                     update_post_meta($receipt_log_id, 'receipt_log_error', $receipt_log_value);
                                     break 2;
+                                }
+                                } */
                                 if (!empty($get_coupon)) {
                                     $subtotal_order_payment = $item_data->get_total();
 …
                                     continue;
+                                }
                                 $product_tax_class = $product_instance->get_tax_class();
+                                $product_tax_class = $item_data->get_tax_class();
                                 $taxes = WC_Tax::get_rates_for_tax_class($product_tax_class);
                                 $tax_arr = json_decode(json_encode($taxes), true);
 …
                                         update_post_meta($post_id, 'success_mydata_date', $invoice_date);
                                         update_post_meta($post_id, 'success_mydata_time', $invoice_time);
+                                        update_post_meta($post_id, 'receipt_type', $invoice_term);
                                         update_post_meta($post_id, 'send_to_api_type', $api_type);
                                         update_post_meta($post_id, 'order_id_to_receipt', $id_of_order);
 …
                                 $quantity = $item_data->get_quantity();
                                 $sum += $quantity;
                                 $product_id = $item_data->get_product_id();
+                               /* $product_id = $item_data->get_product_id();
                                 $product_instance = wc_get_product($product_id);
                                 if($product_instance == null){
 …
                                     update_post_meta($receipt_log_id, 'receipt_log_error', $receipt_log_value);
                                     break 2;
+                                }
+                                } */
                                 if (!empty($get_coupon)) {
                                     $subtotal_order_payment = $item_data->get_total();
 …
+                                }
                                 $product_tax_class = $product_instance->get_tax_class();
+                                $product_tax_class = $item_data->get_tax_class();
                                 $taxes = WC_Tax::get_rates_for_tax_class($product_tax_class);
                                 $tax_arr = json_decode(json_encode($taxes), true);
 …
                     foreach ($total_order->get_items() as $item_id => $item_data) {
                         $product_id = $item_data->get_product_id();
                         $product_instance = wc_get_product($product_id);
                         $product_name_value[] = $product_instance->get_name();
+                       // $product_id = $item_data->get_product_id();
+                       // $product_instance = wc_get_product($product_id);
+                        $product_name_value[] = $item_data->get_name();
                         $product_quantity_value[] = $item_data->get_quantity();
                         $product_tax_class = $product_instance->get_tax_class();
+                        $product_tax_class = $item_data->get_tax_class();
                         $taxes = WC_Tax::get_rates_for_tax_class($product_tax_class);
                         $tax_arr = json_decode(json_encode($taxes), true);
 …
                         $tax_rate = str_replace('%', '', $tax_percent);
                         foreach ($order->get_items() as $item_id => $item_tax) {
                             $product_id = $item_tax->get_product_id();
                             $product_instance = wc_get_product($product_id);
                             $product_tax_class = $product_instance->get_tax_class();
+                           // $product_id = $item_tax->get_product_id();
+                           // $product_instance = wc_get_product($product_id);
+                            $product_tax_class = $item_tax->get_tax_class();
                             $taxes = WC_Tax::get_rates_for_tax_class($product_tax_class);

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

-                      r2823401
+                      r2848352
          */
         require_once PRIMER_PATH . 'includes/class-primer-loader.php';
         /**
          * The class responsible for defining internationalization functionality
 …
          */
         require_once PRIMER_PATH . 'includes/class-primer-i18n.php';
-        require_once PRIMER_PATH . 'admin/includes/primer-admin-notices.php';
         /**
          * The class responsible for defining all actions that occur in the admin area.
 …
          */
         require_once PRIMER_PATH . 'public/class-primer-public.php';
         $this->loader = new Primer_Loader();
         $this->QRcode = new QRcode();
+    }
 …
      */
     private function set_locale() {
         $plugin_i18n = new Primer_i18n();
         $plugin_i18n->set_domain( $this->get_plugin_name() );
         $plugin_i18n->load_plugin_textdomain();
+    }
 …
         $this->loader->add_filter('woocommerce_order_formatted_billing_address', $plugin_admin, 'primer_add_woocommerce_order_fields', 10, 2);
         $this->loader->add_filter('woocommerce_formatted_address_replacements', $plugin_admin, 'primer_add_woocommerce_formatted_address_replacements', 10, 2);
-//      $this->loader->add_filter('woocommerce_billing_fields', $plugin_admin, 'primer_add_woocommerce_billing_fields');
         $this->loader->add_filter('woocommerce_checkout_fields', $plugin_admin, 'primer_remove_woocommerce_shipping_fields');
         $this->loader->add_filter( 'default_checkout_shipping_country', $plugin_admin, 'primer_set_shipping_country' );
 …
         $primer_license_data = get_option('primer_licenses');
         $automation_options = get_option('primer_automation');
-        //if (!empty($automation_options) && !empty($automation_options['activation_automation'])) {
             if(is_array($automation_options) && array_key_exists('activation_automation',$automation_options)) {
                 $check_automation_options = $automation_options['activation_automation'];
 …
                 wp_unschedule_event( $next_timestamp, 'primer_cron_process');
+            }
-        //}
-//      $this->loader->add_action('cmb2_save_page_fields_primer_automation', $plugin_admin, 'convert_order_to_invoice', 10);
         $export_options = get_option('primer_export');
         if (!empty($export_options) && !empty($export_options['export_enable_schedule'])) {

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

-                      r2821718
+                      r2848352
         $issuer_product .= '<tr class="products">';
         $product_id = $item->get_product_id();
         $product_instance = wc_get_product($product_id);
+        //$product_instance = wc_get_product($product_id);
         $issuer_product .= '<td><span class="item_code">'.$product_id.'</span></td>';
         $product_name = $product_instance->get_name();
+        $product_name = $item->get_name();
         $order_country = $order->get_billing_country();
         $product_sale = $product_instance->get_total_sales();
         $sale_price = $product_instance->get_sale_price();
         if (empty($sale_price)) {
             $sale_price = '0';
+        }
+        //$product_sale = $item->get_total_sales();
+        //$sale_price = $item->get_sale_price();
+        //if (empty($sale_price)) {
+        //  $sale_price = '0';
+        //}
             $hideprefix = '_';
             foreach ( $item->get_all_formatted_meta_data( $hideprefix ) as $meta_key => $formatted_meta ) {
 …
             $regular_price = number_format((float)$regular_price, 2);
         $issuer_product .= '<td><span class="item_unit_price">'.$regular_price.'</span></td>';
         $product_tax_class = $product_instance->get_tax_class();
+        $product_tax_class = $item->get_tax_class();
         $taxes = WC_Tax::get_rates_for_tax_class( $product_tax_class );
 …
         foreach ( $order->get_items() as $item_id => $item_tax ) {
             $product_id = $item_tax->get_product_id();
             $product_instance = wc_get_product($product_id);
             $product_tax_class = $product_instance->get_tax_class();
+          //  $product_instance = wc_get_product($product_id);
+            $product_tax_class = $item_tax->get_tax_class();
             $taxes = WC_Tax::get_rates_for_tax_class( $product_tax_class );
 …
     $customer_country = $order_customer_country;
     foreach ( $order->get_items() as $item_id => $item ) {
+    /*foreach ( $order->get_items() as $item_id => $item ) {
         $product_id = $item->get_product_id();
         $product_instance = wc_get_product($product_id);
+    }
+    } */
     $discount_tax = $order->get_discount_tax();
 …
     $currency_symbol = get_woocommerce_currency_symbol( $currency );
     $price_excl_tax = wc_get_price_excluding_tax( $product_instance ); // price without VAT
     $price_incl_tax = $price_excl_tax + $total_tax;  // price with VAT
+    //$price_excl_tax = wc_get_price_excluding_tax( $product_instance ); // price without VAT
+    //$price_incl_tax = $price_excl_tax + $total_tax;  // price with VAT
     $issuer_total .= '<div class="totals">';

primer-mydata/trunk/primer.php

-                      r2823401
+                      r2848352
  * Plugin URI:        primer.gr/plugin/
  * Description:      Issue receipts and invoices with woocommerce.
  * Version:           2.0.7
+ * Version:           2.0.8
  * Author:            Primer Software
  * Author URI:        primer.gr
 …
     exit;
+}
-//
-class PrimerMyData{
-    public $plugin_slug;
-    public $version;
-    public $cache_key;
-    public $cache_allowed;
-    public function __construct() {
-        $this->plugin_slug = plugin_basename( __DIR__ );
-        $this->version = '1.4.4';
-        $this->cache_key = 'primerMyData_custom_upd';
-        $this->cache_allowed = false;
+    }
-    public function request(){
-        $remote = get_transient( $this->cache_key );
-        if( false === $remote || ! $this->cache_allowed ) {
-            $remote = wp_remote_get(
-                'https://primer.gr/wp-content/uploads/2021/12/info.json',
-                array(
-                    'timeout' => 10,
-                    'headers' => array(
-                        'Accept' => 'application/json'
+                    )
+                )
-            );
-            if(
-                is_wp_error( $remote )
-                || 200 !== wp_remote_retrieve_response_code( $remote )
-                || empty( wp_remote_retrieve_body( $remote ) )
-            ) {
-                return false;
+            }
-            set_transient( $this->cache_key, $remote, DAY_IN_SECONDS );
+        }
-        $remote = json_decode( wp_remote_retrieve_body( $remote ) );
-        return $remote;
+    }
-    function info( $res, $action, $args ) {
-        // print_r( $action );
-        // print_r( $args );
-        // do nothing if you're not getting plugin information right now
-        if( 'plugin_information' !== $action ) {
-            return false;
+        }
-        // do nothing if it is not our plugin
-        if( $this->plugin_slug !== $args->slug ) {
-            return false;
+        }
-        // get updates
-        $remote = $this->request();
-        if( ! $remote ) {
-            return false;
+        }
-        $res = new stdClass();
-        $res->name = $remote->name;
-        $res->slug = $remote->slug;
-        $res->version = $remote->version;
-        $res->tested = $remote->tested;
-        $res->requires = $remote->requires;
-        $res->author = $remote->author;
-        $res->author_profile = $remote->author_profile;
-        $res->download_link = $remote->download_url;
-        $res->trunk = $remote->download_url;
-        $res->requires_php = $remote->requires_php;
-        $res->last_updated = $remote->last_updated;
-        $res->sections = array(
-            'description' => $remote->sections->description,
-            'installation' => $remote->sections->installation,
-            'changelog' => $remote->sections->changelog
-        );
-        return $res;
+    }
-    public function update( $transient ) {
-        if ( empty($transient->checked ) ) {
-            return $transient;
+        }
-        $remote = $this->request();
-        if(
-            $remote
-            && version_compare( $this->version, $remote->version, '<' )
-            && version_compare( $remote->requires, get_bloginfo( 'version' ), '<' )
-            && version_compare( $remote->requires_php, PHP_VERSION, '<' )
-        ) {
-            $res = new stdClass();
-            $res->slug = $this->plugin_slug;
-            $res->plugin = plugin_basename( __FILE__ );
-            $res->new_version = $remote->version;
-            $res->tested = $remote->tested;
-            $res->package = $remote->download_url;
-            $transient->response[ $res->plugin ] = $res;
+        }
-        return $transient;
+    }
-    public function purge(){
-        //if (
-          //  $this->cache_allowed
-         //   && 'update' === $options['action']
-        //    && 'plugin' === $options[ 'type' ]
-      //  ) {
-            // just clean the cache when new plugin version is installed
-            delete_transient( $this->cache_key );
-     //   }
+    }
+}
-new PrimerMyData();
-//
 /**
 …
  * Rename this for your plugin and update it as you release new versions.
  */
+define( 'PRIMER_VERSION', '2.0.7' );
+define( 'PRIMER_VERSION', '2.0.8' );
 define( 'PRIMER_NAME', 'Primer MyData' );
 …
 define( 'PRIMER_QR_IMAGE_DIR', $upload_dir['basedir'] . '/primer_qrs/' );
 define( 'PRIMER_QR_IMAGE_URL', $upload_dir['baseurl'] . '/primer_qrs/' );
 define( 'PRIMER_SERVER_PATH', $_SERVER["DOCUMENT_ROOT"].'/wp-content/plugins/primer-mydata' );
 …
         Primer_Activator::activate();
+    }
     /**
      * The code that runs during plugin deactivation.
 …
     register_activation_hook( __FILE__, 'activate_primer' );
     register_deactivation_hook( __FILE__, 'deactivate_primer' );
     /**
      * The core plugin class that is used to define internationalization,
 …
      */
     function run_primer() {
         $plugin = new Primer();
         $plugin->run();
+    }
     add_action( 'plugins_loaded', 'run_primer' ); // wait until 'plugins_loaded' hook fires, for WP Multisite compatibility
 } else {
     add_action('admin_notices', 'primer_error_notice');
 …
         global $current_screen;
         if ($current_screen->parent_base == 'plugins') {
             echo '<div class="error"><p>Primer '.__('requires <a href="https://wordpress.org/plugins/woocommerce/" target="_blank">WooCommerce</a> to be activated to work. Please install and activate <a href="'.admin_url('plugin-install.php?tab=search&type=term&s=WooCommerce').'" target="_blank">Woocommerce</a> first.', 'primer').'</p></div>';
+            echo '<div class="error"><p>Primer MyData '.__('requires <a href="https://wordpress.org/plugins/woocommerce/" target="_blank">WooCommerce</a> to be activated to work. Please install and activate <a href="'.admin_url('plugin-install.php?tab=search&type=term&s=WooCommerce').'" target="_blank">Woocommerce</a> first.', 'primer').'</p></div>';
+        }
+    }
     $plugin = plugin_basename(__FILE__);
     include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
     if(is_plugin_active($plugin)){
         deactivate_plugins( $plugin);
+    }
     if ( isset( $_GET['activate'] ) ) unset( $_GET['activate'] );
+}
-// Patch for Sage-based themes
-function primer_patch_for_sage_based_themes() {
-    // The following is our own solution to the problem of Sage-based themes
-    // which force their own "wrapper", injecting code into our templates where
-    // it is not wanted, breaking them.
-    // i.e.: https://discourse.roots.io/t/single-template-filter-from-plugins/6637
-    global $wp_filter;
-    $tag = 'template_include';
-    $priority = 99;
-    if ( ! isset( $wp_filter[ $tag ] ) ) {
-        return FALSE;
+    }
-    if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
-        $fob       = $wp_filter[ $tag ];
-        $callbacks = &$wp_filter[ $tag ]->callbacks;
-    } else {
-        $callbacks = &$wp_filter[ $tag ];
+    }
-    if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) {
-        return FALSE;
+    }
-    foreach ( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
-        if ( ! isset( $filter['function'] ) || ! is_array( $filter['function'] ) ) {
-            continue;
+        }
-        if ( $filter['function'][1] !== 'wrap' ) {
-            continue;
+        }
-        if ( isset( $fob ) ) {
-            $fob->remove_filter( $tag, $filter['function'], $priority );
-        } else {
-            unset( $callbacks[ $priority ][ $filter_id ] );
-            if ( empty( $callbacks[ $priority ] ) ) {
-                unset( $callbacks[ $priority ] );
+            }
-            if ( empty( $callbacks ) ) {
-                $callbacks = array();
+            }
-            unset( $GLOBALS['merged_filters'][ $tag ] );
+        }
-        return TRUE;
+    }
-    return FALSE;
+}
-add_action( 'get_template_part_primer-receipt-display', 'primer_patch_for_sage_based_themes' );
 function primer_timologio_for_wc_aade_fill() {
-   // global $aade;
-    $get_value = get_option( 'twfc_ls', true );
-   // if ($aade != 'no' && $get_value === 'yes') {
         $vat=sanitize_text_field($_POST['vat']);
         $check= primer_check_for_valid_vat_aade($vat);
         wp_send_json($check);
-   // }
-    wp_send_json([]);
+}
 add_action('wp_ajax_primer_timologio_for_wc_aade_fill', 'primer_timologio_for_wc_aade_fill');
-add_action('wp_ajax_nopriv_primer_timologio_for_wc_aade_fill', 'primer_timologio_for_wc_aade_fill');
 function primer_check_if_aade_isalive($timeout = 3) {
 …
+        }
+}
 function primer_check_for_valid_vat_aade($vat, $country=null) {

primer-mydata/trunk/public/js/primer-public.js

-                      r2812297
+                      r2848352
             var radiobtn = document.getElementById("billing_invoice_type_receipt");
             radiobtn.checked = true;
-        //$('#billing_invoice_type_receipt').trigger('change');
         checkInvoiceFieldsVisibility($invoice_type.val());
         function checkInvoiceFieldsVisibility(radio_val) {
             var required = '<abbr class="required" title="<?php echo $required; ?>">*</abbr>';
+            var required = '<abbr class="required" title="required">*</abbr>';
             var invoice_type = radio_val === 'primer_invoice';
             var optional_element = '<span class="optional">(optional)</span>';

primer-mydata/trunk/views/get_order_list.php

-                      r2813047
+                      r2848352
         if (!empty($_GET['primer_receipt_status'])) {
+            $order_args['meta_key'] = 'receipt_status';
+            $order_args['meta_value'] = sanitize_text_field($_GET['primer_receipt_status']);
+        }
+           // $order_args['meta_key'] = 'receipt_status';
+           // $order_args['meta_value'] = sanitize_text_field($_GET['primer_receipt_status']);
+            if(sanitize_text_field($_GET['primer_receipt_status']) == 'not_issued'){
+                $order_args['meta_key'] = 'receipt_status';
+                $order_args['meta_compare'] = 'NOT EXISTS';
+                $order_args2['meta_key'] = 'receipt_status';
+                $order_args2['meta_value'] = 'issued';
+                $order_args2['meta_compare'] = 'NOT IN';
+            } else {
+                $order_args['meta_key'] = 'receipt_status';
+                  $order_args['meta_value'] = sanitize_text_field($_GET['primer_receipt_status']);
+            }
+        }
         $order_date_from = sanitize_text_field($_GET['order_date_from']);
         $order_date_to = sanitize_text_field($_GET['order_date_to']);

primer-mydata/trunk/views/get_receipt_list.php

-                      r2812297
+                      r2848352
     public $receipt_date_range = array();
+    public function get() {
+        $receipt_args = array(
+            'posts_per_page' => -1,
+    public function get($page_number) {
+        $posts_per_page = 20;
+        $paged = $page_number;
+        $receipt_args = array(
+            'posts_per_page' => $posts_per_page,
+            'paged' => $paged,
+            'limit' => 20,
             'post_type' => 'primer_receipt',
             'post_status' => 'publish',
 …
+    }
     public function get_with_params($receipt_date_from, $receipt_date_to, $receipt_customer, $receipt_status) {
+    public function get_with_params($page_number, $receipt_date_from, $receipt_date_to, $receipt_customer, $receipt_status, $receipt_type) {
         $receipt_status = isset($_GET['primer_receipt_status']) ? sanitize_text_field($_GET['primer_receipt_status']) : '';
+        $receipt_type = isset($_GET['primer_receipt_type']) ? sanitize_text_field($_GET['primer_receipt_type']) : '';
         $receipt_customer = isset($_GET['primer_receipt_client']) ? sanitize_text_field($_GET['primer_receipt_client']) : '';
         $receipt_date_from = isset($_GET['receipt_date_from']) ? sanitize_text_field($_GET['receipt_date_from']) : '';
         $receipt_date_to = isset($_GET['receipt_date_to']) ? sanitize_text_field($_GET['receipt_date_to']) : '';
+        $posts_per_page = 20;
+        $paged = $page_number;
+        $search_term = trim( sanitize_text_field( wp_unslash( $_GET['s'] ?? '' ) ) );
         $meta_values = array();
         $receipt_args = array(
+            'posts_per_page' => -1,
+            'posts_per_page' => $posts_per_page,
+            'paged' => $paged,
+            'limit' => 20,
             'post_type' => 'primer_receipt',
             'post_status' => 'publish',
 …
             $meta_values['receipt_status'][] = $receipt_status;
+        }
+        if (!empty($receipt_type)) {
+            $meta_values['receipt_type'][] = $receipt_type;
+        }
         if (!empty($receipt_customer)) {
 …
             );
+        }
+        if ( ! empty( $search_term ) ) {
+           // $receipt_args['order_id_to_receipt'] = array(intval(sanitize_text_field( wp_unslash( $_GET['s'] ))));
+            $receipt_args['meta_query'][$i + 1]['relation'] = 'OR';
+            $receipt_args['meta_query'][$i + 1][] = [
+                'key' => 'order_id_to_receipt',
+                'value' => array(intval(sanitize_text_field( wp_unslash( $_GET['s'] )))),
+                'compare' => 'IN'];
+            $receipt_args['meta_query'][$i + 1][] = [
+                    'key' => '_primer_receipt_number',
+                    'value' => array(intval(sanitize_text_field( wp_unslash( $_GET['s'] )))),
+                    'compare' => 'IN'];
+        }

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory

Context Navigation

Changeset 2848352

Legend:

primer-mydata/trunk/README.txt

primer-mydata/trunk/admin/class-primer-admin.php

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

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

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

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

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

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

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

primer-mydata/trunk/primer.php

primer-mydata/trunk/public/js/primer-public.js

primer-mydata/trunk/views/get_order_list.php

primer-mydata/trunk/views/get_receipt_list.php

Download in other formats: