Changeset 2620849
- Timestamp:
- 10/27/2021 01:48:00 PM (4 years ago)
- Location:
- integrai
- Files:
-
- 6 added
- 14 deleted
- 18 edited
- 1 copied
-
tags/1.0.18 (copied) (copied from integrai/trunk)
-
tags/1.0.18/includes/class-integrai-order.php (modified) (4 diffs)
-
tags/1.0.18/includes/class-integrai-process-event.php (modified) (3 diffs)
-
tags/1.0.18/includes/class-integrai-shipping-helper.php (modified) (2 diffs)
-
tags/1.0.18/includes/model/class-integrai-model-config.php (modified) (1 diff)
-
tags/1.0.18/includes/model/class-integrai-model-helper.php (modified) (2 diffs)
-
tags/1.0.18/includes/templates/admin-order-detail.php (added)
-
tags/1.0.18/includes/templates/boleto/admin-order-detail.php (deleted)
-
tags/1.0.18/includes/templates/boleto/payment-success.php (deleted)
-
tags/1.0.18/includes/templates/credit-card/admin-order-detail.php (deleted)
-
tags/1.0.18/includes/templates/credit-card/payment-success.php (deleted)
-
tags/1.0.18/includes/templates/marketplace (deleted)
-
tags/1.0.18/includes/templates/payment-success.php (added)
-
tags/1.0.18/includes/templates/pix/admin-order-detail.php (deleted)
-
tags/1.0.18/includes/templates/pix/payment-success.php (deleted)
-
tags/1.0.18/public/class-integrai-payment-method-boleto.php (modified) (3 diffs)
-
tags/1.0.18/public/class-integrai-payment-method-credit-card.php (modified) (3 diffs)
-
tags/1.0.18/public/class-integrai-payment-method-market-place.php (modified) (2 diffs)
-
tags/1.0.18/public/class-integrai-payment-method-pix.php (modified) (3 diffs)
-
tags/1.0.18/public/class-integrai-payment-method.php (added)
-
trunk/includes/class-integrai-order.php (modified) (4 diffs)
-
trunk/includes/class-integrai-process-event.php (modified) (3 diffs)
-
trunk/includes/class-integrai-shipping-helper.php (modified) (2 diffs)
-
trunk/includes/model/class-integrai-model-config.php (modified) (1 diff)
-
trunk/includes/model/class-integrai-model-helper.php (modified) (2 diffs)
-
trunk/includes/templates/admin-order-detail.php (added)
-
trunk/includes/templates/boleto/admin-order-detail.php (deleted)
-
trunk/includes/templates/boleto/payment-success.php (deleted)
-
trunk/includes/templates/credit-card/admin-order-detail.php (deleted)
-
trunk/includes/templates/credit-card/payment-success.php (deleted)
-
trunk/includes/templates/marketplace (deleted)
-
trunk/includes/templates/payment-success.php (added)
-
trunk/includes/templates/pix/admin-order-detail.php (deleted)
-
trunk/includes/templates/pix/payment-success.php (deleted)
-
trunk/public/class-integrai-payment-method-boleto.php (modified) (3 diffs)
-
trunk/public/class-integrai-payment-method-credit-card.php (modified) (3 diffs)
-
trunk/public/class-integrai-payment-method-market-place.php (modified) (2 diffs)
-
trunk/public/class-integrai-payment-method-pix.php (modified) (3 diffs)
-
trunk/public/class-integrai-payment-method.php (added)
Legend:
- Unmodified
- Added
- Removed
-
integrai/tags/1.0.18/includes/class-integrai-order.php
r2619757 r2620849 6 6 7 7 $order = new WC_Order(); 8 $order->update_meta_data('_order_number', $orderData['order'][' id']);8 $order->update_meta_data('_order_number', $orderData['order']['external_id']); 9 9 $order->set_currency(get_woocommerce_currency()); 10 10 $order->set_prices_include_tax('yes' === get_option( 'woocommerce_prices_include_tax' )); 11 11 $order->set_customer_id($customerId); 12 $order->set_payment_method('integrai_marketplace');13 12 14 13 // Add items … … 50 49 51 50 $rate = new WC_Shipping_Rate( 52 ' flat_rate_shipping',51 'integrai_shipping_method_shipping', 53 52 $shippingDescription, 54 53 $shippingPrice, … … 58 57 $item = new WC_Order_Item_Shipping(); 59 58 $item->set_props(array( 60 'method_title' => $rate->label,61 'method_id' => $rate->id,62 'total' => wc_format_decimal($rate->cost),63 'taxes' => $rate->taxes,64 'meta_data' => $rate->get_meta_data())59 'method_title' => $rate->label, 60 'method_id' => $rate->id, 61 'total' => wc_format_decimal($rate->cost), 62 'taxes' => $rate->taxes, 63 'meta_data' => $rate->get_meta_data()) 65 64 ); 66 65 $order->add_item($item); 67 66 68 // Add payment response values 69 $order->update_meta_data('payment_response', array( 70 "module_name" => $orderData['order']['marketplace'], 71 "marketplace_id" => $orderData['order']['id'], 72 )); 67 // Add payment method 68 $order->set_payment_method('integrai_marketplace'); 69 70 // Add marketplace info 71 if ($orderData['marketplace']) { 72 $order->update_meta_data('marketplace', $orderData['marketplace']); 73 } 74 75 // Add payments 76 if ($orderData['payments']) { 77 $order->update_meta_data('payments', $orderData['payments']); 78 } 73 79 74 80 $order->calculate_totals(); … … 77 83 return $order->get_data(); 78 84 } 85 86 public function getOrderId($orderData) { 87 $order = $orderData['order']; 88 89 if (isset($order['id'])) { 90 return $order['id']; 91 } 92 93 if (isset($order['external_id'])) { 94 $orderQuery = new WC_Order_Query(array( 95 'limit' => 1, 96 'meta_key' => '_order_number', 97 'meta_value' => $order['external_id'] 98 )); 99 100 $orders = $orderQuery->get_orders(); 101 102 if (count($orders)) { 103 return $orders[0]->id; 104 } 105 } 106 } 79 107 } -
integrai/tags/1.0.18/includes/class-integrai-process-event.php
r2619757 r2620849 14 14 $modelArgs = $this->transform_args($modelItem); 15 15 $modelMethods = $modelItem->methods; 16 17 16 $model = $modelItem->functionName ? call_user_func_array($modelItem->functionName, $modelArgs) : new $modelItem->className(...$modelArgs); 18 17 $model = $this->run_methods($model, $modelMethods); … … 59 58 $newArgs = array(); 60 59 61 $args = isset($itemValue->args) ? (array)$itemValue->args: null;60 $args = isset($itemValue->args) ? json_decode(json_encode($itemValue->args), true) : null; 62 61 63 62 if (is_array($args)) { … … 78 77 } 79 78 80 return $newArgs;79 return json_decode(json_encode($newArgs), true); 81 80 } 82 81 } -
integrai/tags/1.0.18/includes/class-integrai-shipping-helper.php
r2579713 r2620849 138 138 array_push($transformed_items, 139 139 array( 140 "weight" => (float) number_format( $product_data->get_weight(), 3),141 "width" => (float) number_format( $width, 2),142 "height" => (float) number_format( $height, 2),143 "length" => (float) number_format( $length, 2),140 "weight" => (float) number_format((float)$product_data->get_weight(), 3), 141 "width" => (float) number_format((float)$width, 2), 142 "height" => (float) number_format((float)$height, 2), 143 "length" => (float) number_format((float)$length, 2), 144 144 "quantity" => (int) max(1, $quantity), 145 145 "sku" => (string) $product_data->get_sku(), … … 154 154 155 155 private function get_value_or_default($attr, $data) { 156 $shipping_config = $this->get_config_helper()->get_shipping();157 158 return $data->{"get_$attr"}() ?: $shipping_config["{$attr}_default"];156 $shipping_config = $this->get_config_helper()->get_shipping(); 157 $default = isset($shipping_config["{$attr}_default"]) ? $shipping_config["{$attr}_default"] : ''; 158 return $data->{"get_$attr"}() ?: $default; 159 159 } 160 160 -
integrai/tags/1.0.18/includes/model/class-integrai-model-config.php
r2588825 r2620849 131 131 $configs = $this->get_global(); 132 132 133 return isset($configs) && $configs[$name]? $configs[$name] : $defaultValue;133 return isset($configs) && isset($configs[$name]) ? $configs[$name] : $defaultValue; 134 134 } 135 135 -
integrai/tags/1.0.18/includes/model/class-integrai-model-helper.php
r2619757 r2620849 42 42 43 43 if ( is_null( $this->get_by_name($name, $parseJson) ) ) { 44 return $this->insert( $data);44 return $this->insert( array_merge($data, $where, array('updatedAt' => date('Y-m-d H:i:s'), 'createdAt' => date('Y-m-d H:i:s'))) ); 45 45 } else { 46 return $this->update( $data, $where );46 return $this->update( array_merge($data, array('updatedAt' => date('Y-m-d H:i:s'))), $where ); 47 47 } 48 48 } … … 87 87 88 88 public function get_by_name($name, $parseJson = true) { 89 $ lower_name = strtolower( $name );90 $raw_data = $this->get("WHERE name = '$ lower_name'");89 $upper_name = strtoupper( $name ); 90 $raw_data = $this->get("WHERE name = '$upper_name'"); 91 91 92 92 try { -
integrai/tags/1.0.18/public/class-integrai-payment-method-boleto.php
r2588825 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 199 201 200 202 $this->get_helper()->get_template( 201 ' boleto/payment-success.php',203 'payment-success.php', 202 204 array( 203 ' options' => $options,204 'order' => $order,205 'pageSuccess' => json_encode($options), 206 'order' => json_encode($order), 205 207 ), 206 208 ); … … 225 227 return; 226 228 227 $data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true ); 228 $payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true ); 229 $boleto_url = isset($payment_response['boleto_url']) ? $payment_response['boleto_url'] : $this->get_helper()->get_boleto_url($order->get_order_number()); 230 231 if ( 232 isset($data) 233 && $boleto_url 234 && isset($data['boleto_doc_type']) 235 && isset($data['boleto_doc_number']) 236 ) { 237 $module_name = isset($payment_response['module_name']) ? sanitize_text_field($payment_response['module_name']) : ''; 238 $transaction_id = isset($payment_response['transaction_id']) ? sanitize_text_field($payment_response['transaction_id']) : ''; 239 $date_approved = isset($payment_response['date_approved']) ? sanitize_text_field($payment_response['date_approved']) : ''; 240 $boleto_doc_type = isset($payment_response['boleto_doc_type']) ? sanitize_text_field($payment_response['boleto_doc_type']) : ''; 241 $boleto_doc_number = isset($payment_response['boleto_doc_number']) ? sanitize_text_field($payment_response['boleto_doc_number']) : ''; 242 243 $meta_data = array( 244 __('Pagamento', 'integrai') => 'Boleto', 245 __('Processado por', 'integrai' ) => $module_name, 246 __('Identificação da transação', 'integrai' ) => $transaction_id, 247 __('Data de pagamento', 'integrai' ) => $date_approved, 248 __('Documento', 'integrai') => $boleto_doc_type, 249 __('Número do Documento', 'integrai') => $boleto_doc_number, 250 ); 251 229 $payment_method_model = new Integrai_Payment_Method(); 230 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 231 232 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 252 233 $this->get_helper()->get_template( 253 'boleto/admin-order-detail.php',254 array(255 'data' => $meta_data,256 'boleto_url' => $boleto_url,257 ),234 'admin-order-detail.php', 235 array( 236 'marketplace_data' => $admin_data['marketplace_data'], 237 'payments' => $admin_data['payments'], 238 ), 258 239 ); 259 240 } -
integrai/tags/1.0.18/public/class-integrai-payment-method-credit-card.php
r2619757 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 188 190 189 191 $this->get_helper()->get_template( 190 'credit-card/payment-success.php',191 array(192 'options' => $options,193 'order' => $order,194 ),192 'payment-success.php', 193 array( 194 'pageSuccess' => json_encode($options), 195 'order' => json_encode($order), 196 ), 195 197 ); 196 198 } … … 214 216 return; 215 217 216 $data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true ); 217 $payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true ); 218 219 if ( 220 isset($data) 221 && isset($data['cc_card_brand']) 222 && isset($data['cc_doc_type']) 223 && isset($data['cc_doc_number']) 224 && isset($data['cc_installments']) 225 ) { 226 227 $meta_data = array( 228 __( 'Pagamento', 'integrai' ) => 'Cartão de Crédito', 229 __( 'Documento', 'integrai' ) => sanitize_text_field( strtoupper( $data['cc_doc_type'] ) ), 230 __( 'Número do Documento', 'integrai' ) => sanitize_text_field( $data['cc_doc_number'] ) 231 ); 232 233 if (isset($payment_response['module_name'])) { 234 $meta_data[__( 'Processado por', 'integrai' )] = sanitize_text_field($payment_response['module_name']); 235 } 236 237 if (isset($payment_response['transaction_id'])) { 238 $meta_data[__( 'Identificação da transação', 'integrai' )] = sanitize_text_field($payment_response['transaction_id']); 239 } 240 241 if (isset($payment_response['date_approved'])) { 242 $meta_data[__( 'Data de pagamento', 'integrai' )] = sanitize_text_field($payment_response['date_approved']); 243 } 244 245 if (isset($payment_response['card'])) { 246 $card = (array) $payment_response['card']; 247 $card_number = $card['last_four_digits']; 248 $card_installments = isset($payment_response['installments']) ? $payment_response['installments'] : $data['cc_installments']; 249 $card_brand = isset($card['brand']) ? $card['brand'] : $data['cc_card_brand']; 250 $card_holder = $card['holder']; 251 252 $meta_data[__( 'Número de Parcelas', 'integrai' )] = sanitize_text_field( $card_installments ); 253 $meta_data[__( 'Número do cartão', 'integrai' )] = sanitize_text_field( "**** **** **** $card_number" ); 254 $meta_data[__( 'Nome do titular', 'integrai' )] = sanitize_text_field( $card_holder ); 255 $meta_data[__( 'Bandeira', 'integrai' )] = sanitize_text_field( strtoupper( $card_brand ) ); 256 } 257 218 $payment_method_model = new Integrai_Payment_Method(); 219 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 220 221 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 258 222 $this->get_helper()->get_template( 259 'credit-card/admin-order-detail.php', 260 array( 261 'data' => $meta_data, 262 ), 223 'admin-order-detail.php', 224 array( 225 'marketplace_data' => $admin_data['marketplace_data'], 226 'payments' => $admin_data['payments'], 227 ), 263 228 ); 264 229 } -
integrai/tags/1.0.18/public/class-integrai-payment-method-market-place.php
r2619757 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 86 88 return; 87 89 88 $ data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true);89 $ payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true);90 $payment_method_model = new Integrai_Payment_Method(); 91 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 90 92 91 if (isset($data)) { 92 $module_name = isset($payment_response['module_name']) ? sanitize_text_field($payment_response['module_name']) : ''; 93 $transaction_id = isset($payment_response['transaction_id']) ? sanitize_text_field($payment_response['transaction_id']) : ''; 94 $date_approved = isset($payment_response['date_approved']) ? sanitize_text_field($payment_response['date_approved']) : ''; 95 96 $meta_data = array( 97 __('Pagamento', 'integrai') => 'Marketplace', 98 __('Processado por', 'integrai' ) => $module_name, 99 __('Identificação da transação', 'integrai' ) => $transaction_id, 100 __('Data de pagamento', 'integrai' ) => $date_approved, 101 ); 102 93 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 103 94 $this->get_helper()->get_template( 104 'marketplace/admin-order-detail.php', 105 array( 106 'data' => $meta_data, 107 ), 95 'admin-order-detail.php', 96 array( 97 'marketplace_data' => $admin_data['marketplace_data'], 98 'payments' => $admin_data['payments'], 99 ), 108 100 ); 109 101 } -
integrai/tags/1.0.18/public/class-integrai-payment-method-pix.php
r2588825 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 194 196 195 197 $this->get_helper()->get_template( 196 'pix/payment-success.php',197 array(198 'options' => $options,199 'order' => $order,200 ),198 'payment-success.php', 199 array( 200 'pageSuccess' => json_encode($options), 201 'order' => json_encode($order), 202 ), 201 203 ); 202 204 } … … 220 222 return; 221 223 222 $data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true ); 223 $payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true ); 224 $qr_code = $payment_response['qr_code'] ?? $payment_response['qr_code']; 225 $qr_code_base64 = $payment_response['qr_code_base64'] ?? $payment_response['qr_code_base64']; 226 227 if ( 228 isset($data) 229 && $qr_code 230 && $qr_code_base64 231 && isset($data['pix_doc_type']) 232 && isset($data['pix_doc_number']) 233 ) { 234 $module_name = isset($payment_response['module_name']) ? sanitize_text_field($payment_response['module_name']) : ''; 235 $transaction_id = isset($payment_response['transaction_id']) ? sanitize_text_field($payment_response['transaction_id']) : ''; 236 $date_approved = isset($payment_response['date_approved']) ? sanitize_text_field($payment_response['date_approved']) : ''; 237 $pix_doc_type = isset($payment_response['pix_doc_type']) ? sanitize_text_field($payment_response['pix_doc_type']) : ''; 238 $pix_doc_number = isset($payment_response['pix_doc_number']) ? sanitize_text_field($payment_response['pix_doc_number']) : ''; 239 240 $meta_data = array( 241 __('Pagamento', 'integrai') => 'Pix', 242 __('Processado por', 'integrai' ) => $module_name, 243 __('Identificação da transação', 'integrai' ) => $transaction_id, 244 __('Data de pagamento', 'integrai' ) => $date_approved, 245 __('Documento', 'integrai') => $pix_doc_type, 246 __('Número do Documento', 'integrai') => $pix_doc_number, 247 ); 248 224 $payment_method_model = new Integrai_Payment_Method(); 225 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 226 227 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 249 228 $this->get_helper()->get_template( 250 'pix/admin-order-detail.php', 251 array( 252 'data' => $meta_data, 253 'qr_code' => $qr_code, 254 'qr_code_base64' => $qr_code_base64, 255 ), 229 'admin-order-detail.php', 230 array( 231 'marketplace_data' => $admin_data['marketplace_data'], 232 'payments' => $admin_data['payments'], 233 ), 256 234 ); 257 235 } -
integrai/trunk/includes/class-integrai-order.php
r2619757 r2620849 6 6 7 7 $order = new WC_Order(); 8 $order->update_meta_data('_order_number', $orderData['order'][' id']);8 $order->update_meta_data('_order_number', $orderData['order']['external_id']); 9 9 $order->set_currency(get_woocommerce_currency()); 10 10 $order->set_prices_include_tax('yes' === get_option( 'woocommerce_prices_include_tax' )); 11 11 $order->set_customer_id($customerId); 12 $order->set_payment_method('integrai_marketplace');13 12 14 13 // Add items … … 50 49 51 50 $rate = new WC_Shipping_Rate( 52 ' flat_rate_shipping',51 'integrai_shipping_method_shipping', 53 52 $shippingDescription, 54 53 $shippingPrice, … … 58 57 $item = new WC_Order_Item_Shipping(); 59 58 $item->set_props(array( 60 'method_title' => $rate->label,61 'method_id' => $rate->id,62 'total' => wc_format_decimal($rate->cost),63 'taxes' => $rate->taxes,64 'meta_data' => $rate->get_meta_data())59 'method_title' => $rate->label, 60 'method_id' => $rate->id, 61 'total' => wc_format_decimal($rate->cost), 62 'taxes' => $rate->taxes, 63 'meta_data' => $rate->get_meta_data()) 65 64 ); 66 65 $order->add_item($item); 67 66 68 // Add payment response values 69 $order->update_meta_data('payment_response', array( 70 "module_name" => $orderData['order']['marketplace'], 71 "marketplace_id" => $orderData['order']['id'], 72 )); 67 // Add payment method 68 $order->set_payment_method('integrai_marketplace'); 69 70 // Add marketplace info 71 if ($orderData['marketplace']) { 72 $order->update_meta_data('marketplace', $orderData['marketplace']); 73 } 74 75 // Add payments 76 if ($orderData['payments']) { 77 $order->update_meta_data('payments', $orderData['payments']); 78 } 73 79 74 80 $order->calculate_totals(); … … 77 83 return $order->get_data(); 78 84 } 85 86 public function getOrderId($orderData) { 87 $order = $orderData['order']; 88 89 if (isset($order['id'])) { 90 return $order['id']; 91 } 92 93 if (isset($order['external_id'])) { 94 $orderQuery = new WC_Order_Query(array( 95 'limit' => 1, 96 'meta_key' => '_order_number', 97 'meta_value' => $order['external_id'] 98 )); 99 100 $orders = $orderQuery->get_orders(); 101 102 if (count($orders)) { 103 return $orders[0]->id; 104 } 105 } 106 } 79 107 } -
integrai/trunk/includes/class-integrai-process-event.php
r2619757 r2620849 14 14 $modelArgs = $this->transform_args($modelItem); 15 15 $modelMethods = $modelItem->methods; 16 17 16 $model = $modelItem->functionName ? call_user_func_array($modelItem->functionName, $modelArgs) : new $modelItem->className(...$modelArgs); 18 17 $model = $this->run_methods($model, $modelMethods); … … 59 58 $newArgs = array(); 60 59 61 $args = isset($itemValue->args) ? (array)$itemValue->args: null;60 $args = isset($itemValue->args) ? json_decode(json_encode($itemValue->args), true) : null; 62 61 63 62 if (is_array($args)) { … … 78 77 } 79 78 80 return $newArgs;79 return json_decode(json_encode($newArgs), true); 81 80 } 82 81 } -
integrai/trunk/includes/class-integrai-shipping-helper.php
r2579713 r2620849 138 138 array_push($transformed_items, 139 139 array( 140 "weight" => (float) number_format( $product_data->get_weight(), 3),141 "width" => (float) number_format( $width, 2),142 "height" => (float) number_format( $height, 2),143 "length" => (float) number_format( $length, 2),140 "weight" => (float) number_format((float)$product_data->get_weight(), 3), 141 "width" => (float) number_format((float)$width, 2), 142 "height" => (float) number_format((float)$height, 2), 143 "length" => (float) number_format((float)$length, 2), 144 144 "quantity" => (int) max(1, $quantity), 145 145 "sku" => (string) $product_data->get_sku(), … … 154 154 155 155 private function get_value_or_default($attr, $data) { 156 $shipping_config = $this->get_config_helper()->get_shipping();157 158 return $data->{"get_$attr"}() ?: $shipping_config["{$attr}_default"];156 $shipping_config = $this->get_config_helper()->get_shipping(); 157 $default = isset($shipping_config["{$attr}_default"]) ? $shipping_config["{$attr}_default"] : ''; 158 return $data->{"get_$attr"}() ?: $default; 159 159 } 160 160 -
integrai/trunk/includes/model/class-integrai-model-config.php
r2588825 r2620849 131 131 $configs = $this->get_global(); 132 132 133 return isset($configs) && $configs[$name]? $configs[$name] : $defaultValue;133 return isset($configs) && isset($configs[$name]) ? $configs[$name] : $defaultValue; 134 134 } 135 135 -
integrai/trunk/includes/model/class-integrai-model-helper.php
r2619757 r2620849 42 42 43 43 if ( is_null( $this->get_by_name($name, $parseJson) ) ) { 44 return $this->insert( $data);44 return $this->insert( array_merge($data, $where, array('updatedAt' => date('Y-m-d H:i:s'), 'createdAt' => date('Y-m-d H:i:s'))) ); 45 45 } else { 46 return $this->update( $data, $where );46 return $this->update( array_merge($data, array('updatedAt' => date('Y-m-d H:i:s'))), $where ); 47 47 } 48 48 } … … 87 87 88 88 public function get_by_name($name, $parseJson = true) { 89 $ lower_name = strtolower( $name );90 $raw_data = $this->get("WHERE name = '$ lower_name'");89 $upper_name = strtoupper( $name ); 90 $raw_data = $this->get("WHERE name = '$upper_name'"); 91 91 92 92 try { -
integrai/trunk/public/class-integrai-payment-method-boleto.php
r2588825 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 199 201 200 202 $this->get_helper()->get_template( 201 ' boleto/payment-success.php',203 'payment-success.php', 202 204 array( 203 ' options' => $options,204 'order' => $order,205 'pageSuccess' => json_encode($options), 206 'order' => json_encode($order), 205 207 ), 206 208 ); … … 225 227 return; 226 228 227 $data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true ); 228 $payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true ); 229 $boleto_url = isset($payment_response['boleto_url']) ? $payment_response['boleto_url'] : $this->get_helper()->get_boleto_url($order->get_order_number()); 230 231 if ( 232 isset($data) 233 && $boleto_url 234 && isset($data['boleto_doc_type']) 235 && isset($data['boleto_doc_number']) 236 ) { 237 $module_name = isset($payment_response['module_name']) ? sanitize_text_field($payment_response['module_name']) : ''; 238 $transaction_id = isset($payment_response['transaction_id']) ? sanitize_text_field($payment_response['transaction_id']) : ''; 239 $date_approved = isset($payment_response['date_approved']) ? sanitize_text_field($payment_response['date_approved']) : ''; 240 $boleto_doc_type = isset($payment_response['boleto_doc_type']) ? sanitize_text_field($payment_response['boleto_doc_type']) : ''; 241 $boleto_doc_number = isset($payment_response['boleto_doc_number']) ? sanitize_text_field($payment_response['boleto_doc_number']) : ''; 242 243 $meta_data = array( 244 __('Pagamento', 'integrai') => 'Boleto', 245 __('Processado por', 'integrai' ) => $module_name, 246 __('Identificação da transação', 'integrai' ) => $transaction_id, 247 __('Data de pagamento', 'integrai' ) => $date_approved, 248 __('Documento', 'integrai') => $boleto_doc_type, 249 __('Número do Documento', 'integrai') => $boleto_doc_number, 250 ); 251 229 $payment_method_model = new Integrai_Payment_Method(); 230 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 231 232 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 252 233 $this->get_helper()->get_template( 253 'boleto/admin-order-detail.php',254 array(255 'data' => $meta_data,256 'boleto_url' => $boleto_url,257 ),234 'admin-order-detail.php', 235 array( 236 'marketplace_data' => $admin_data['marketplace_data'], 237 'payments' => $admin_data['payments'], 238 ), 258 239 ); 259 240 } -
integrai/trunk/public/class-integrai-payment-method-credit-card.php
r2619757 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 188 190 189 191 $this->get_helper()->get_template( 190 'credit-card/payment-success.php',191 array(192 'options' => $options,193 'order' => $order,194 ),192 'payment-success.php', 193 array( 194 'pageSuccess' => json_encode($options), 195 'order' => json_encode($order), 196 ), 195 197 ); 196 198 } … … 214 216 return; 215 217 216 $data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true ); 217 $payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true ); 218 219 if ( 220 isset($data) 221 && isset($data['cc_card_brand']) 222 && isset($data['cc_doc_type']) 223 && isset($data['cc_doc_number']) 224 && isset($data['cc_installments']) 225 ) { 226 227 $meta_data = array( 228 __( 'Pagamento', 'integrai' ) => 'Cartão de Crédito', 229 __( 'Documento', 'integrai' ) => sanitize_text_field( strtoupper( $data['cc_doc_type'] ) ), 230 __( 'Número do Documento', 'integrai' ) => sanitize_text_field( $data['cc_doc_number'] ) 231 ); 232 233 if (isset($payment_response['module_name'])) { 234 $meta_data[__( 'Processado por', 'integrai' )] = sanitize_text_field($payment_response['module_name']); 235 } 236 237 if (isset($payment_response['transaction_id'])) { 238 $meta_data[__( 'Identificação da transação', 'integrai' )] = sanitize_text_field($payment_response['transaction_id']); 239 } 240 241 if (isset($payment_response['date_approved'])) { 242 $meta_data[__( 'Data de pagamento', 'integrai' )] = sanitize_text_field($payment_response['date_approved']); 243 } 244 245 if (isset($payment_response['card'])) { 246 $card = (array) $payment_response['card']; 247 $card_number = $card['last_four_digits']; 248 $card_installments = isset($payment_response['installments']) ? $payment_response['installments'] : $data['cc_installments']; 249 $card_brand = isset($card['brand']) ? $card['brand'] : $data['cc_card_brand']; 250 $card_holder = $card['holder']; 251 252 $meta_data[__( 'Número de Parcelas', 'integrai' )] = sanitize_text_field( $card_installments ); 253 $meta_data[__( 'Número do cartão', 'integrai' )] = sanitize_text_field( "**** **** **** $card_number" ); 254 $meta_data[__( 'Nome do titular', 'integrai' )] = sanitize_text_field( $card_holder ); 255 $meta_data[__( 'Bandeira', 'integrai' )] = sanitize_text_field( strtoupper( $card_brand ) ); 256 } 257 218 $payment_method_model = new Integrai_Payment_Method(); 219 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 220 221 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 258 222 $this->get_helper()->get_template( 259 'credit-card/admin-order-detail.php', 260 array( 261 'data' => $meta_data, 262 ), 223 'admin-order-detail.php', 224 array( 225 'marketplace_data' => $admin_data['marketplace_data'], 226 'payments' => $admin_data['payments'], 227 ), 263 228 ); 264 229 } -
integrai/trunk/public/class-integrai-payment-method-market-place.php
r2619757 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 86 88 return; 87 89 88 $ data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true);89 $ payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true);90 $payment_method_model = new Integrai_Payment_Method(); 91 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 90 92 91 if (isset($data)) { 92 $module_name = isset($payment_response['module_name']) ? sanitize_text_field($payment_response['module_name']) : ''; 93 $transaction_id = isset($payment_response['transaction_id']) ? sanitize_text_field($payment_response['transaction_id']) : ''; 94 $date_approved = isset($payment_response['date_approved']) ? sanitize_text_field($payment_response['date_approved']) : ''; 95 96 $meta_data = array( 97 __('Pagamento', 'integrai') => 'Marketplace', 98 __('Processado por', 'integrai' ) => $module_name, 99 __('Identificação da transação', 'integrai' ) => $transaction_id, 100 __('Data de pagamento', 'integrai' ) => $date_approved, 101 ); 102 93 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 103 94 $this->get_helper()->get_template( 104 'marketplace/admin-order-detail.php', 105 array( 106 'data' => $meta_data, 107 ), 95 'admin-order-detail.php', 96 array( 97 'marketplace_data' => $admin_data['marketplace_data'], 98 'payments' => $admin_data['payments'], 99 ), 108 100 ); 109 101 } -
integrai/trunk/public/class-integrai-payment-method-pix.php
r2588825 r2620849 1 1 <?php 2 3 include_once INTEGRAI__PLUGIN_DIR . 'public/class-integrai-payment-method.php'; 2 4 3 5 if ( class_exists( 'WC_Payment_Gateway' ) ) : … … 194 196 195 197 $this->get_helper()->get_template( 196 'pix/payment-success.php',197 array(198 'options' => $options,199 'order' => $order,200 ),198 'payment-success.php', 199 array( 200 'pageSuccess' => json_encode($options), 201 'order' => json_encode($order), 202 ), 201 203 ); 202 204 } … … 220 222 return; 221 223 222 $data = get_post_meta( $order->get_id(), '_integrai_transaction_data', true ); 223 $payment_response = (array) get_post_meta( $order->get_id(), 'payment_response', true ); 224 $qr_code = $payment_response['qr_code'] ?? $payment_response['qr_code']; 225 $qr_code_base64 = $payment_response['qr_code_base64'] ?? $payment_response['qr_code_base64']; 226 227 if ( 228 isset($data) 229 && $qr_code 230 && $qr_code_base64 231 && isset($data['pix_doc_type']) 232 && isset($data['pix_doc_number']) 233 ) { 234 $module_name = isset($payment_response['module_name']) ? sanitize_text_field($payment_response['module_name']) : ''; 235 $transaction_id = isset($payment_response['transaction_id']) ? sanitize_text_field($payment_response['transaction_id']) : ''; 236 $date_approved = isset($payment_response['date_approved']) ? sanitize_text_field($payment_response['date_approved']) : ''; 237 $pix_doc_type = isset($payment_response['pix_doc_type']) ? sanitize_text_field($payment_response['pix_doc_type']) : ''; 238 $pix_doc_number = isset($payment_response['pix_doc_number']) ? sanitize_text_field($payment_response['pix_doc_number']) : ''; 239 240 $meta_data = array( 241 __('Pagamento', 'integrai') => 'Pix', 242 __('Processado por', 'integrai' ) => $module_name, 243 __('Identificação da transação', 'integrai' ) => $transaction_id, 244 __('Data de pagamento', 'integrai' ) => $date_approved, 245 __('Documento', 'integrai') => $pix_doc_type, 246 __('Número do Documento', 'integrai') => $pix_doc_number, 247 ); 248 224 $payment_method_model = new Integrai_Payment_Method(); 225 $admin_data = $payment_method_model->admin_order_meta($order->get_id()); 226 227 if (!empty($admin_data['marketplace_data']) || !empty($admin_data['payments'])) { 249 228 $this->get_helper()->get_template( 250 'pix/admin-order-detail.php', 251 array( 252 'data' => $meta_data, 253 'qr_code' => $qr_code, 254 'qr_code_base64' => $qr_code_base64, 255 ), 229 'admin-order-detail.php', 230 array( 231 'marketplace_data' => $admin_data['marketplace_data'], 232 'payments' => $admin_data['payments'], 233 ), 256 234 ); 257 235 }
Note: See TracChangeset
for help on using the changeset viewer.