integrasjon av kredittkorttype

Author: dmattke

GFDibsDao.php

@@ -1,6 +1,6 @@
 <?php
 
-  add_action( 'init', array('GFDibsDao', 'updateDb') );
+  // add_action( 'init', array('GFDibsDao', 'updateDb') );
   class GFDibsDao {
       protected $dibs_table_name;
       protected $gf_table_name;
@@ -52,7 +52,7 @@ function createTransaction( $post ){
         $this->log('POST variables');
         $this->log($post);
 
-         $this->db->insert(
+        $this->db->insert(
             $this->gf_table_name,
             array(
               'order_id'      => $post['orderId'],
@@ -86,18 +86,29 @@ function updateTransaction( $post ){
           $transaction_id = $post['transact'];
         }
 
+        $paytype = null;
+        if ( isset($post['cardnomask']) ){
+          $paytype = $post['cardnomask'];
+
+          if ( isset($post['paytype']) ){
+            $paytype .= ' ('.$post['paytype'].')';
+          }
+        }
+
         $this->db->update(
           $this->gf_table_name,
           array(
             'completed'         => 1,
             'transaction_id'    => $transaction_id,
             'ticket'            => ( isset($post['ticket']) ) ? $post['ticket'] : false,
+            'paytype'           => $paytype,
           ),
           array( 'order_id' => $post['orderId'] ),
           array(
             '%d',
             '%s',
-            '%s'
+            '%s',
+            '%s',
           )
           );
       }
@@ -218,6 +229,7 @@ function setupTables(){
             `completed` int(1) DEFAULT NULL,
             `transaction_id` varchar(50) DEFAULT NULL,
             `payment_type` varchar(50) DEFAULT NULL,
+            `paytype` varchar(50) DEFAULT NULL,
             `test` int(1) DEFAULT NULL,
             `amount` int(10) DEFAULT NULL,
             `date_created` datetime DEFAULT NULL,
@@ -229,10 +241,21 @@ function setupTables(){
 
           $wpdb->query($sql);
 
-        // error_log($sql);
+
+        try{
+          // update $transaction_table
+          $sql = sprintf( "SHOW COLUMNS FROM %s LIKE 'paytype'; ", $transaction_table);
+          $has_column = $wpdb->query($sql);
+          if ( !$has_column ){
+            $sql = sprintf("ALTER TABLE %s ADD paytype varchar(40) DEFAULT NULL", $transaction_table ) ;
+            $wpdb->query($sql);
+          }
+        }
+        catch(Excecption $e){}
 
       }
 
+
       function setDateCompleted($lead_id){
         $sql = sprintf('UPDATE %s SET date_completed="%s" where lead_id=%d', $this->gf_table_name, date('Y-m-d H:i:s'), $lead_id );
         error_log($sql);

GFDibsHook.php

@@ -487,8 +487,6 @@ public static function updateLeadAfterPayment(){
         $Dao->updateTransaction($_POST);
 
         // send confirmation mails
-        _log('confm');
-        _log($order_id);
         if ( $Transaction = $Dao->getTransactionByOrderId($order_id) ){
           _log($Transaction);
            /* prod */
@@ -587,10 +585,10 @@ public static function addPaymentDetails($form, $lead){
               <th scope="col" class="width_15"><?php _e('Date', DIBS_LANG);?></th>
               <th scope="col" class="width_15"><?php _e('Transaction id', DIBS_LANG);?></th>
               <th scope="col" class="width_15"><?php _e('Ticket', DIBS_LANG);?></th>
-              <th scope="col" class="width_20"><?php _e('Payment Type', DIBS_LANG);?></th>
-
+              <th scope="col" class="width_10"><?php _e('Payment Type', DIBS_LANG);?></th>
               <th scope="col" class="width_10"><?php _e('Completed' , DIBS_LANG);?></th>
               <th scope="col" class="width_5"><?php _e('Amount', DIBS_LANG);?></th>
+              <th scope="col" class="width_15"><?php _e('Credit card', DIBS_LANG);?></th>
               <th scope="col" class="width_5"><?php _e('Test', DIBS_LANG);?></th>
             </thead>
 
@@ -602,6 +600,7 @@ public static function addPaymentDetails($form, $lead){
               <td ><?php echo $Transaction->payment_type; ?></td>
               <td><?php echo ( ($Transaction->completed) ? __('yes', DIBS_LANG) : __('no', DIBS_LANG)  ); ?></td>
               <td><?php echo ($Transaction->amount/100); ?> <?php echo get_option('rg_gforms_currency');?></td>
+              <td><?php echo ( ($Transaction->paytype) ? $Transaction->paytype : ''  ); ?></td>
               <td><?php echo ( ($Transaction->test) ? __('yes', DIBS_LANG) : __('no', DIBS_LANG)  ); ?></td>
               </tr>
             </tbody>

GFDibsUpdater.php

@@ -15,6 +15,7 @@ class GFDibsUpdater{
 
   function __construct($plugin_file ){
     $this->PluginFile = $plugin_file;
+
     add_filter( "plugins_api", array( $this, "setPluginInfo" ), 10, 3 );
     add_filter( "pre_set_site_transient_update_plugins", array( $this, "setTransitent" ), 1 );
     add_action( 'admin_notices', array($this, 'getLicenceKeyInfo') );
@@ -24,7 +25,7 @@ function __construct($plugin_file ){
 
 
   function afterUpdate( $true, $hook_extra, $result ){
-    _debug('after update');
+    // _log('after update');
     global $wp_filesystem;
     //$this->getCurrentVersionInfo();
 
@@ -85,7 +86,6 @@ function setTransitent( $transient ){
 
     if( isset($transient->response) ){
       if ( !isset($transient->response[$this->Plugin]) ){
-        // _debug('if');
 
         $current_tag = $this->updateAvailable();
         // _debug($current_tag);
@@ -183,7 +183,7 @@ function getReleaseInfo(){
     $query_vars = array( 'plugin' => $this->Slug );
     $url = self::buildUrl('releases', $query_vars);
 
-    _debug($url);
+    _log($url);
     $response = wp_remote_retrieve_body(wp_remote_get( $url ));
 
     return $response;
@@ -221,7 +221,7 @@ function checkLicenceKey(){
 
     $url = self::buildUrl('licence', $query_vars);
 
-    _debug($url);
+    // _log($url);
     $response = wp_remote_retrieve_body(wp_remote_get( $url ));
 
     return $response;
@@ -235,7 +235,7 @@ function registerPlugin($plugin = null, $network_activation = null ){
       );
 
     $url = self::buildUrl('activation', $query_vars);
-    _debug($url);
+    // _log($url);
     wp_remote_get( $url );
   }