Changeset 2586168

Timestamp:

08/20/2021 08:16:25 PM (5 years ago)

Author:

kakaroto84

Message:

1.2

• Update to 1.8 Version of Yabi
• Change numeric variables to strings

Location:

wc-yabi/trunk

Files:

• content/product.php (modified) (4 diffs)
• includes/transaction.php (modified) (9 diffs)
• readme.txt (modified) (2 diffs)
• wc-yabi.php (modified) (3 diffs)

wc-yabi/trunk/content/product.php

@@ -5 +5 @@
     }
     
-    <?php if( $person['accountid'] == 2 ): ?>
+    <?php if( $person['accountid'] == 'NATURAL' ): ?>
     
         .data-commercialname, #identifier-instruction
@@ -21 +21 @@
     var accountid = jQuery('#accountid').val();
     
-    if( parseInt( accountid ) == 1 )
+    if( accountid == 'LEGAL' )
     {
         jQuery('.data-commercialname').show(500);
         jQuery('#identifier-instruction').show();
         
-        jQuery('#type').val(31);
+        jQuery('#type').val('NIT');
     }
     else
@@ -33 +33 @@
         jQuery('#identifier-instruction').hide();
         
-        jQuery('#type').val(13);
+        jQuery('#type').val('CC');
     }
 }
@@ -129 +129 @@
     </tr>
     
-    <tr class="data-commercialname">
+    <tr>
         <th><?php echo __('Tax Level Code','yabi-wc'); ?>:</th>
         <td>

wc-yabi/trunk/includes/transaction.php

@@ -3 +3 @@
 function yabi_create_commercial( $person )
 {
-    if( $person['accountid'] == 1 )
-    {
-        $taxlevelcode = $person['taxlevelcode'];
-        $pieces = explode( ',', $taxlevelcode );
-        $pieceformat = array();
-        foreach( $pieces as $p )
-        {
-            $tax = trim( $p );
-            if( !empty( $tax ) )
-            {
-                array_push( $pieceformat, '"'. $tax .'"' );
-            }
-        }
-        $taxlevelcode = implode( ',', $pieceformat );
-        
+    $taxlevelcode = $person['taxlevelcode'];
+    $pieces = explode( ',', $taxlevelcode );
+    $pieceformat = array();
+    foreach( $pieces as $p )
+    {
+        $tax = trim( $p );
+        if( !empty( $tax ) )
+        {
+            array_push( $pieceformat, '"'. $tax .'"' );
+        }
+    }
+    $taxlevelcode = implode( ',', $pieceformat );
+    
+    if( $person['accountid'] == 'LEGAL' )
+    {       
         $taxscheme = '';
         if( $person['taxscheme'] )
@@ -32 +32 @@
     else
     {
-        $commercial = 'partyTaxRegime:"49"';
+        $commercial = 'partyTaxScheme:{
+            taxLevelCode:['. $taxlevelcode .']
+        }';
     }
     
@@ -57 +59 @@
     }   
     
-    $invoicetypecode = "01";
-    if( $person['accountid'] == 1 )
-    {
-        $invoicetypecode = "02";
+    $invoicetypecode = "SALES_INVOICE";
+    if( $person['accountid'] == 'LEGAL' )
+    {
+        $invoicetypecode = "SALES_INVOICE";
     }
     
@@ -86 +88 @@
         invoiceAcquirerId:{
           identifier:"'. $person['identifier'] .'"
-          type:"'. $person['type'] .'"
+          type:'. $person['type'] .'
         }
         invoiceConsecutive:"'. $invoiceConsecutive .'"
@@ -94 +96 @@
           ]
           paymentMeans:{
-            id:"1"
+            id:IN_CASH
             paymentDueDate:"'. $payment['dueDate'] .'"
             paymentId:"'. $payment['id'] .'"
@@ -104 +106 @@
           documentCurrencyId:"COP"
           dueDate:"'. $payment['dueDate'] .'"
-          invoiceOperationCode:"10"
-          invoiceTypeCode:"'. $invoicetypecode .'"
+          invoiceTypeCode:'. $invoicetypecode .'
           issueDateTime:"'. $payment['dateTime'] .'"
         }
@@ -111 +112 @@
           id:1
           taxAmount:'. $data_products['total_tax'] .'
-          taxSchemeId:"01"
+          taxSchemeId:IVA
           taxSubtotal:['. $tax_subtotal .']
         }]
@@ -166 +167 @@
               baseQuantity:1
               currencyId:"COP"
-              unitCode:"ZZ"
+              unitCode:"UnitCode"
               value:'. $basevalue .'
             }
             quantity:'. $item['quantity'] .'
             standardItemId:{
-              agencyId:""
+              agencyId:OFE_STD
               id:"'. $item['id'] .'"
-              name:"Estándar de Adopción del contribuyente"
-              schemaId:"999"
+              name:OFE_STD
+              schemaId:OFE_STD
             }
             taxTotals:[{
               id:1
-              taxSchemeId:"01"
+              taxSchemeId:IVA
               taxSubtotal:{
                 percent:'. $item['percent'] .'
@@ -185 +186 @@
               }
             }]
-            unit:"ZZ"
+            unit:"Unit"
           }';
           

wc-yabi/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://www.paypal.me/datakun
 Requires at least: 5.5
-Tested up to: 5.7.1
+Tested up to: 5.8
 Requires PHP: 7.4
 Stable tag: trunk
@@ -82 +82 @@
 = 1.1.1 =
 * Timeout was increased as Yabi servers started experiencing service delays
+= 1.2 =
+* Update to 1.8 Version of Yabi
+* Change numeric variables to strings

wc-yabi/trunk/wc-yabi.php

@@ -9 +9 @@
  * Plugin URI:        https://mireunion.com/yabi
  * Description:       Create your electronic invoices of purchases made in woocommerce with Yabi
- * Version:           1.1.1
+ * Version:           1.2
  * Author:            Mex Avila
  * Author URI:        https://datakun.com/
@@ -87 +87 @@
     $yabi_invoice = get_post_meta( $post->ID, 'yabi_invoice', true );
     $thetypes = array( 
-        13 => 'Cédula de ciudadanía',
-        31 => 'NIT',
-        12 => 'Tarjeta de identidad',
-        21 => 'Tarjeta de extranjería',
-        22 => 'Cédula de extranjería',
-        41 => 'Pasaporte',
-        42 => 'Documento de identificación extranjero',
-        50 => 'NIT de otro país',
-        91 => 'NUIP *'
+        'CC'    => 'Cédula de ciudadanía',
+        'NIT'   => 'NIT',
+        'TI'    => 'Tarjeta de identidad',
+        'TE'    => 'Tarjeta de extranjería',
+        'CE'    => 'Cédula de extranjería',
+        'P'     => 'Pasaporte',
+        'RC'    => 'Registro Civil',
+        'DIE'   => 'Documento de identificación extranjero',
+        'NITE'  => 'Número de Identificación Tributaria Extranjera',
+        'NUIP'  => 'Número Único de Identificación Personal'
     );
     $typesperson = array(
-        1 => 'Persona Jurídica',
-        2 => 'Persona Natural'
+        'LEGAL'     => 'Persona Jurídica',
+        'NATURAL'   => 'Persona Natural'
     );
     $person = get_post_meta( $post->ID, 'yabi_person', true );
@@ -121 +122 @@
             
             $identifier = get_post_meta( $post->ID, 'nit', true );
-            $type = 13;
-            $accountid = 2;
+            $type = 'CC';
+            $accountid = 'NATURAL';
             $commercialname = '';
-            $taxlevelcode = '';
+            $taxlevelcode = 'O-48';
             $taxscheme = 0;