'; - - $payment_types = array( - 'amex', - 'dc', - 'discover', - 'elv', - 'jcb', - 'maestro', - 'mastercard', - 'unionpay', - 'visa', + + $settings = array( + 'flat_shipping_country' => __('Shipping Country', 'paymill'), + 'flat_shipping_costs' => __('Shipping Costs', 'paymill'), + 'flat_shipping_vat' => __('Shipping VAT', 'paymill'), ); - foreach($payment_types as $type){ - $checked = esc_attr( $this->paymill_general_settings[$args['option']][$type] ); - - echo ' - - '; + + for($i = 1; $i <= $shipping; $i++){ + foreach($settings as $setting => $description){ + add_settings_field($setting.'_'.$i, $description, array(&$this, 'print_config_form_fields'), $this->setting_keys['paymill_pay_button_settings'], 'section_pay_button_shipping', array('desc' => $setting, 'id' => $i, 'group' => 'flat_shipping', 'page' => $this->setting_keys['paymill_pay_button_settings'])); + } } - }else{ + + if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_register_pay_button_setting'); // benchmark + } + // The following methods provide descriptions for their respective sections, used as callbacks with add_settings_section + public function section_general_desc() { echo __('Please insert your API settings here.', 'paymill'); } + public function section_pay_button_desc() { echo '
'.__('The Paymill Pay Buton is a simple, independent payment solution. As Paymill for WordPress is GPL licensed, feel free to customize that Pay Button to fit your needs.', 'paymill').'
'.__('Common Settings', 'paymill').'
'.''.__('Configure common settings', 'paymill').'
'.__('Toggle View', 'paymill').''.__('Products', 'paymill').'
'.__('Configure products for the Pay Button. This list has a dynamic length and extends for 5 extra slots when last slot\'s Product Title is filled and saved.', 'paymill').'
'.__('Toggle View', 'paymill').''.__('Shipping', 'paymill').'
'.__('Set delivery countries and shipping costs. This list has a dynamic length and extends for 5 extra slots when last slot\'s Shipping Country is filled and saved.', 'paymill').'
'.__('Toggle View', 'paymill').''; + if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_plugin_options_page'); // benchmark } - } - - /* - * pay_button Option field callback, same as above. - */ - function field_pay_button_option($args) { - $descriptions = array(); - - $descriptions['number_decimal'] = __('Set a symbol used for decimal point. Default: .', 'paymill'); - $descriptions['number_thousands'] = __('Set a symbol used for thousands seperator. Default: ,', 'paymill'); - $descriptions['email_outgoing'] = __('Outgoing Emailaddress for customer order confirmation mail.', 'paymill'); - $descriptions['email_incoming'] = __('Incoming Emailaddress for Copy of customer order confirmation mail.', 'paymill'); - $descriptions['thankyou_url'] = __('Redirect URL for custom thank your page.', 'paymill'); - - $descriptions['fields_hide'] = __('You may want to hide certain fields. Select them here:', 'paymill'); - $descriptions['no_default_css'] = __('Advanced users want to fully customize the payment button. Disabling default CSS from Pay Button will make that much easier.', 'paymill'); - - $descriptions['flat_shipping_country'] = __('Name of the available delivery country, e.g. "England"', 'paymill'); - $descriptions['flat_shipping_costs'] = __('Gross fee for the flat shipping costs., e.g. "7" or "4.90"', 'paymill'); - $descriptions['flat_shipping_vat'] = __('Value-Added-Tax Rate in % for the flat shipping costs., e.g. "19" or "7"', 'paymill'); + // pay_button Option field callback, same as above. + private function print_config_form_fields($args) { + if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_field_pay_button_option'); // benchmark - $descriptions['products_title'] = __('Name of the product', 'paymill'); - $descriptions['products_desc'] = __('Detailed description of the product', 'paymill'); - $descriptions['products_price'] = __('Gross Price of the product, e.g. "40" or "6.99"', 'paymill'); - $descriptions['products_offer'] = __('If you have created a subscription in your Paymill Cockpit, can select it here. If selected, it will overwrite the following settings for this product. Important: For Performance purposes, subscription plans will be cached. Open this page to recache it.', 'paymill'); - $descriptions['products_vat'] = __('Value-Added-Tax Rate in % for the product, e.g. "19" or "7"', 'paymill'); - $descriptions['products_delivery'] = __('Delivery Time of the product, e.g. "2 Days" or "1 Week"', 'paymill'); - $descriptions['products_quantityhide'] = __('Hide quantity select field, quantity will be set to 1', 'paymill'); - $descriptions['products_freeamount'] = __('Allow free amounts (donation feature)', 'paymill'); + // setup of value fields + $option = ''; + $value = ''; + $id = ''; + $page = $args['page']; - - if(strlen($args['option']) > 0){ - $option = '['.$args['option'].']'; - $value = esc_attr($this->paymill_pay_button_settings[$args['option']]); - }else{ - $option = ''; - } - - if(strlen($args['id']) > 0){ - $id = '['.$args['id'].']'; - $value = esc_attr($this->paymill_pay_button_settings[$args['option']][$args['id']]); - }else{ - $id = ''; - } - - if(strlen($args['field']) > 0){ - $field = '['.$args['field'].']'; - $value = esc_attr($this->paymill_pay_button_settings[$args['option']][$args['id']][$args['field']]); - }else{ - $field = ''; - } - - - if($args['desc'] == 'products_desc'){ - echo ' - - '.$descriptions[$args['desc']].' - '; - }elseif($args['desc'] == 'products_offer'){ - $subscriptions = new paymill_subscriptions('pay_button'); - $offers = $subscriptions->offerGetList(true); - echo ''.$descriptions[$args['desc']].''; - }elseif($args['desc'] == 'products_quantityhide' || $args['desc'] == 'products_freeamount' || $args['desc'] == 'no_default_css'){ - echo ' - - '.$descriptions[$args['desc']].' - '; - }elseif($args['desc'] == 'fields_hide'){ - echo $descriptions[$args['desc']].'.'/img/logo.png'.'){kind=logo}
'; - $fields_hide = array( - 'shipping', - 'company_name', - 'forename', - 'surname', - 'street', - 'number', - 'zip', - 'city', - 'email', - 'phone', - ); - foreach($fields_hide as $field){ - $checked = esc_attr( $this->paymill_pay_button_settings[$args['option']][$field] ); - + // show settings + $descriptions['payments_display'] = __('Check the boxes which payment types should be announced on payment form', 'paymill'); + $descriptions['products_desc'] = __('Detailed description of the product', 'paymill'); + $descriptions['products_price'] = __('Gross Price of the product, e.g. 40 or 6.99', 'paymill'); + $descriptions['products_offer'] = __('If you have created a subscription in your Paymill Cockpit, you can select it here. If selected, it will overwrite the following settings for this product. Important: For Performance purposes, subscription plans will be cached. Open this page to recache it.', 'paymill'); + $descriptions['products_vat'] = __('Value-Added-Tax Rate in % for the product, e.g. 19 or 7', 'paymill'); + $descriptions['products_delivery'] = __('Delivery Time of the product, e.g. 2 Days or 1 Week', 'paymill'); + $descriptions['products_quantityhide'] = __('Hide quantity select field, quantity will be set to 1', 'paymill'); + $descriptions['products_freeamount'] = __('Allow free amounts (donation feature)', 'paymill'); + + if($args['desc'] == 'payments_display'){ + echo $descriptions[$args['desc']].'
'; + + $payment_types = array( + 'amex', + 'cb', + 'dc', + 'discover', + 'elv', + 'jcb', + 'maestro', + 'mastercard', + 'sepa', + 'unionpay', + 'visa', + ); + foreach($payment_types as $type){ + if(isset($this->{$page}[$args['desc']][$type])){ + $checked = esc_attr( $this->{$page}[$args['desc']][$type] ); + }else{ + $checked = false; + } + + echo ' + + '; + } + }elseif($args['desc'] == 'products_offer'){ // products_offer + $subscriptions = new paymill_subscriptions('pay_button'); + $offers = $subscriptions->offerGetList(true); + if(count($offers) > 0){ + echo ''; + } + }elseif($args['desc'] == 'products_quantityhide' || $args['desc'] == 'no_default_css'){ // products_quantityhide, no_default_css + echo ' + + '; + }elseif($args['desc'] == 'fields_show'){ + echo __('You may want to gather some additional information from your customers. Select them here:', 'paymill').'
'; + + $fields_show = array( + 'shipping', + 'company_name', + 'forename', + 'surname', + 'street', + 'number', + 'zip', + 'city', + /*'email',*/ + 'phone', + ); + foreach($fields_show as $field){ + if(isset($this->{$page}[$args['desc']][$field])){ + $checked = esc_attr($this->{$page}[$args['desc']][$field]); + }else{ + $checked = false; + } + echo ' + + '; + } + echo ''; + }else{ echo ' - + type="text" + name="'.$this->setting_keys[$page].$option.'" + value="'.$value.'" + class="regular-text code" /> '; } - }else{ - echo ' - - '.$descriptions[$args['desc']].' - '; + + if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_field_pay_button_option'); // benchmark } - - if($args['desc'] == 'flat_shipping_vat' || $args['desc'] == 'products_delivery'){ - echo '
{$section['title']}
\n"; + } + if($section['callback']){ + call_user_func($section['callback'], $section); + } + if(!isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section['id']])){ + continue; + } + echo '';
+ $this->paymill_do_settings_fields($page, $section['id']);
+ echo '
';
+ }
}
- }
-
- /*
- * Called during admin_menu, adds an options
- * page under Settings called My Settings, rendered
- * using the plugin_options_page method.
- */
- function add_admin_menus() {
- add_menu_page('Paymill', 'Paymill', 8, $this->plugin_options_key, array( &$this, 'plugin_options_page' ), plugins_url('',__FILE__ ).'/img/icon.png');
- }
-
- /*
- * Plugin Options page rendering goes here, checks
- * for active tab and replaces key with the related
- * settings key. Uses the plugin_options_tabs method
- * to render the tabs.
- */
- function plugin_options_page() {
- $tab = isset( $_GET['tab'] ) ? $_GET['tab'] : $this->setting_keys['paymill_general_settings'];
-?>
- .'/img/logo.png'; ?>){kind=logo}
-
- plugin_options_tabs(); ?>
-
-
-
-
- ISO 4217 e.g. "EUR" or "GBP"', 'paymill');
+ $descriptions['api_key_private'] = __('Insert your Paymill PRIVATE API key.', 'paymill');
+ $descriptions['api_key_public'] = __('Insert your Paymill PUBLIC API key.', 'paymill');
+
+ $descriptions['flat_shipping_country'] = __('Name of the available delivery country, e.g. England', 'paymill');
+ $descriptions['flat_shipping_costs'] = __('Gross fee for the flat shipping costs., e.g. 7 or 4.90', 'paymill');
+ $descriptions['flat_shipping_vat'] = __('Value-Added-Tax Rate in % for the flat shipping costs., e.g. 19 or 7', 'paymill');
+
+ $descriptions['products_title'] = __('Name of the product', 'paymill');
+ $descriptions['products_desc'] = __('Detailed description of the product', 'paymill');
+ $descriptions['products_price'] = __('Gross Price of the product, e.g. 40 or 6.99', 'paymill');
+ $descriptions['products_offer'] = __('If you have created a subscription in your Paymill Cockpit, can select it here. If selected, it will overwrite the following settings for this product. Important: For Performance purposes, subscription plans will be cached. Open this page to recache it.', 'paymill');
+ $descriptions['products_vat'] = __('Value-Added-Tax Rate in % for the product, e.g. 19 or 7', 'paymill');
+ $descriptions['products_delivery'] = __('Delivery Time of the product, e.g. 2 Days or 1 Week', 'paymill');
+ $descriptions['products_quantityhide'] = __('Hide quantity select field, quantity will be set to 1', 'paymill');
+ $descriptions['products_freeamount'] = __('Allow free amounts (donation feature)', 'paymill');
+
+ if(!isset($wp_settings_fields[$page][$section])){
+ return;
+ }
+
+ foreach((array)$wp_settings_fields[$page][$section] as $field){
+ if(isset($field['args']['group'])){
+ $group_titles[$field['args']['desc']] = $field['title'];
+ $group_fields[$field['args']['id']][$field['args']['desc']] = $field;
+ }else{
+ echo '';
+ echo '
';
+ }
+ }
+ if(isset($field['args']['group']) && isset($group_titles) && is_array($group_titles) && count($group_titles) > 0){
+ echo ''.$field['title'].'
';
+ call_user_func($field['callback'], $field['args']);
+ if(isset($descriptions[$field['id']])){
+ echo ''.$descriptions[$field['id']].'';
+ }
+ echo ''.$desc.' | ';
+ }
+ echo '
| '; + call_user_func($group_field['callback'], $group_field['args']); + echo ' | '; + } + echo '
'; foreach ( $this->plugin_settings_tabs as $tab_key => $tab_caption ) { $active = $current_tab == $tab_key ? 'nav-tab-active' : ''; - echo '' . $tab_caption . ''; + echo '' . $tab_caption . ''; } echo '
'; + if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_plugin_options_tabs'); // benchmark } }; // Initialize the plugin -//add_action( 'plugins_loaded', create_function( '', '$this = new paymill_settings;' ) ); $GLOBALS['paymill_settings'] = new paymill_settings; ?> \ No newline at end of file diff --git a/lib/css/paymill.css b/lib/css/paymill.css index 0299c12..8cf1abd 100644 --- a/lib/css/paymill.css +++ b/lib/css/paymill.css @@ -1,246 +1,209 @@ /* form validation */ - #paymill_payment_form .LV_validation_message{ - font-weight:bold; - margin:0 0 0 5px; + font-weight:bold; + margin:0 0 0 5px; } - #paymill_payment_form .LV_valid { - color:#00CC00; + color:#00CC00; float:none; } - #paymill_payment_form .LV_invalid { - color:#CC0000; + color:#CC0000; float:none; } - #paymill_payment_form .LV_valid_field, #paymill_payment_form input.LV_valid_field:hover, #paymill_payment_form input.LV_valid_field:active, #paymill_payment_form textarea.LV_valid_field:hover, #paymill_payment_form textarea.LV_valid_field:active { - border: 1px solid #00CC00; -} - + border: 1px solid #00CC00; +} #paymill_payment_form .LV_invalid_field, #paymill_payment_form input.LV_invalid_field:hover, #paymill_payment_form nput.LV_invalid_field:active, #paymill_payment_form textarea.LV_invalid_field:hover, #paymill_payment_form textarea.LV_invalid_field:active { - border: 1px solid #CC0000; + border: 1px solid #CC0000; } -#paymill_payment_form input{ - -webkit-box-sizing: content-box !important; - -moz-box-sizing: content-box !important; - box-sizing: content-box !important; - margin:0px !important; +/* paymment form */ +#paymill_payment_form input, .paymill_pay_button input{ + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding:3px; + margin:0px 0px 5px 0px; + height:30px; + width:100%; + font-size:15px; } - .payment_method_paymill{ overflow:hidden; } -label[for=payment_method_paymill] *{ - overflow:hidden; - background-color:transparent; -} - -#paymill_payment_form #card-expiry-month{ - width:20px; +#paymill_payment_form #paymill_card_expiry_month{ + width:40px; text-align:center; } - -#paymill_payment_form #card-expiry-year{ - width:40px; +#paymill_payment_form #paymill_card_expiry_year{ + width:50px; text-align:center; } - -#paymill_payment_form #card-cvc{ - width:30px; +#paymill_payment_form #paymill_card_cvc{ + width:40px; text-align:center; } -#paymill_payment_form #card-number{ - background-image:url('../img/cc_logos_v.png'); +#paymill_payment_form #paymill_card_number{ + background-image:url('../img/payment_logos.png'); background-repeat:no-repeat; background-position:0px 30px; - padding-left:55px; - width:150px; + text-align:right; + font-size:90%; } -#paymill_payment_form #holdername, -#paymill_payment_form #transaction-form-account, -#paymill_payment_form #transaction-form-code{ - width:200px; -} - #paymill_framebox img{ box-shadow:none !important; } - -#form-credit, #form-elv{ +paymill_#form_credit, paymill_#form_elv{ clear:both; } - -.paymill_form-switch{ +.paymill_form_switch{ -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - background-color: #F5F5F5; - background-image: linear-gradient(to bottom, #FFFFFF, #E6E6E6); - background-repeat: repeat-x; - border-color: #BBBBBB #BBBBBB #A2A2A2; - border-image: none; - border-radius: 4px 4px 4px 4px; - border-style: solid; - border-width: 1px; - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); - color: #333333; - cursor: pointer; - display: inline-block; - font-size: 13px; - line-height: 20px; - margin-bottom: 10px; - padding: 4px 12px; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; + -moz-border-left-colors: none; + -moz-border-right-colors: none; + -moz-border-top-colors: none; + background-color: #F5F5F5; + background-image: linear-gradient(to bottom, #FFFFFF, #E6E6E6); + background-repeat: repeat-x; + border-color: #BBBBBB #BBBBBB #A2A2A2; + border-image: none; + border-radius: 4px; + border-style: solid; + border-width: 1px; + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); + color: #333333; + cursor: pointer; + display: inline-block; + font-size: 13px; + line-height: 20px; + margin-bottom: 10px; + padding: 4px 12px; + text-align: center; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: middle; +} +.paymill_form_switch:hover{ + background-color: #E6E6E6; + color: #333333; +} +.paymill_form_switch_active, .paymill_form_switch_active:hover{ + background-color: #EC4F00; + background-image: linear-gradient(to bottom, #F05000, #E64D00); + background-repeat: repeat-x; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + color: #FFFFFF; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.paymill_payment_logos{ + margin-bottom:10px; } -.paymill_form-switch:hover{ - background-color: #E6E6E6; - color: #333333; +/* error box */ +#paymill_errors{ + background-color:#FF3300; + padding:5px; + color:#FFF; + margin:10px 0px 10px 0px; + border-radius: 4px; } -.paymill_form-switch_active, .paymill_form-switch_active:hover{ - background-color: #EC4F00; - background-image: linear-gradient(to bottom, #F05000, #E64D00); - background-repeat: repeat-x; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - color: #FFFFFF; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +#paymill_errors:after{ + content:''; + display:block; + clear:both; +} +#paymill_errors .paymill_error_title{ + margin:0px 10px 0px 0px; + padding:0px; + color:#FFF; + font-weight:bold; + float:left; } -#form-credit .form-row p{ - display: inline; +#paymill_errors .paymill_error{ + color:#FFF; + float:left; } /* pay button */ .paymill_hidden{ display:none; } - -.paymill_pay_button{ - margin-bottom:50px; - border:1px solid #EC4F00; - border-radius: 15px; - padding:5px; - background-color:#E6E6E6; -} - .paymill_pay_button #place_order{ width:100%; font-weight:bold; font-size:120%; } - .paymill_products{ - margin-bottom:20px; + margin-bottom:10px; } - .paymill_pay_button .paymill_product{ - margin-bottom:5px; - padding-bottom:10px; - border-bottom:1px dashed #EC4F00; + margin-bottom:10px; +} +.paymill_pay_button .paymill_product:after{ + content:''; + display:block; + clear:both; } - .paymill_pay_button .paymill_title{ font-weight:bold; font-size:120%; margin-bottom:5px; } - .paymill_pay_button .paymill_desc{ font-size:80%; margin-bottom:5px; } - .paymill_pay_button .paymill_quantity{ - margin-bottom:5px; + margin:0px 5px 5px 0px; + float:left; + font-size:120%; } - .paymill_pay_button .paymill_price{ font-weight:bold; font-size:120%; margin-bottom:5px; + float:left; } - .paymill_pay_button .paymill_vat{ margin-bottom:5px; font-size:70%; } - .paymill_pay_button .paymill_delivery{ font-size:70%; } - .paymill_pay_button .paymill_total_price{ - margin-top:15px; font-size:120%; font-weight:bold; } - -.paymill_pay_button #paymill_payment_form *{ - font-size:100%; -} -.paymill_pay_button #paymill_payment_form label{ - display:block; -} -.paymill_pay_button #paymill_payment_form input{ +.paymill_pay_button .paymill_shipping{ margin-bottom:10px; } - .paymill_pay_button .paymill_payment_errors{ font-weight:bold; margin-bottom:5px; padding-bottom:5px; } - - -.paymill_pay_button .paymill_address .form-row { - position:relative; -} - -.paymill_pay_button .paymill_address .form-row label{ - display:block; - height:35px; - line-height:35px; -} - -.paymill_pay_button .paymill_address .form-row input{ - margin-left:auto; - margin-right:0px; - position:absolute; - right:0px; - top:0px; - width:100px; -} - .paymill_pay_button .paymill_address .paymill_address_title{ font-weight:bold; font-size:120%; border-top:1px solid #EC4F00; margin-top:5px; - padding-top:15px; + padding-top:5px; } - .paymill_pay_button .paymill_payment_title{ font-weight:bold; font-size:120%; border-top:1px solid #EC4F00; - margin-top:20px; - padding-top:15px; + margin-top:10px; + padding-top:5px; } - - -.paybutton #payment_method_paymill{ +.paymill_pay_button #payment_method_paymill{ display:none; } \ No newline at end of file diff --git a/lib/css/paymill_admin.css b/lib/css/paymill_admin.css new file mode 100644 index 0000000..dbaf15b --- /dev/null +++ b/lib/css/paymill_admin.css @@ -0,0 +1,70 @@ +.tooltip, .tooltip-2 { + width: 256px; + min-width: 256px; + position: absolute; + bottom: 0; + left: 50%; + display: none; + font-weight: normal; + font-size: 12px; + line-height: 1.5em; + color: #fff; + z-index: 50; + margin-bottom:12px; +} +.tooltip .text { + padding: 5px 15px 35px 15px; + background: url(../img/tooltip.png) no-repeat 0 100%; +} +.tooltip .top { + height: 10px; + background: url(../img/tooltip.png) no-repeat 0 0; +} + + +.paymill_settings_section_pay_button_products td > *{ + max-width:98%; +} + +/* hide quantity */ +.paymill_settings_section_pay_button_products td:nth-child(3){ + max-width:100px; +} + +/* delivery time */ +.paymill_settings_section_pay_button_products td:nth-child(4){ + max-width:100px; +} + +/* VAT */ +.paymill_settings_section_pay_button_products td:nth-child(5){ + max-width:60px; +} + +/* Price */ +.paymill_settings_section_pay_button_products td:nth-child(7){ + max-width:100px; +} + +.paymill_settings > div{ + margin-top:10px; +} +.paymill_settings div .title{ + font-weight:bold; +} + +.paymill_settings .products_name, .paymill_settings .flat_shipping_name{ + font-weight:bold; + text-align:center; +} +.paymill_settings .products_name:after, .paymill_settings .flat_shipping_name:after{ + content:'*'; +} +.payments_display{ + overflow:hidden; +} +.payments_display:after{ + content:''; + display:block; + clear:both; +} \ No newline at end of file diff --git a/lib/errors.inc.php b/lib/errors.inc.php new file mode 100644 index 0000000..f3e3bed --- /dev/null +++ b/lib/errors.inc.php @@ -0,0 +1,55 @@ +errors); + } + + public function status(){ + if($this->amount() > 0){ + return true; + } + } + + public function setFunction($function){ + if(is_string($function)){ + $this->outputFunction = $function; + return true; + }else{ + return false; + } + } + + public function getFunction(){ + return $this->outputFunction; + } + + public function setError($error){ + $this->errors[] = $error; + } + + public function getErrors($function=false,$flush=false){ + if($function === false && $this->getFunction() !== false && is_string($this->getFunction())){ + $function = $this->getFunction(); + } + + if(strlen($function) > 0){ + return $function($this->errors); + }else{ + return $this->errors; + } + if($flush === true){ + $this->errors = array(); + } + } +} + +?> \ No newline at end of file diff --git a/lib/img/cc_logos.png b/lib/img/cc_logos.png deleted file mode 100644 index 0f6ac4f..0000000 Binary files a/lib/img/cc_logos.png and /dev/null differ diff --git a/lib/img/cc_logos_v.png b/lib/img/cc_logos_v.png deleted file mode 100644 index 956e692..0000000 Binary files a/lib/img/cc_logos_v.png and /dev/null differ diff --git a/lib/img/cc_logos_woocommerce.png b/lib/img/cc_logos_woocommerce.png deleted file mode 100644 index 0f6ac4f..0000000 Binary files a/lib/img/cc_logos_woocommerce.png and /dev/null differ diff --git a/lib/img/creditcard-icons.png b/lib/img/creditcard-icons.png deleted file mode 100644 index f4af265..0000000 Binary files a/lib/img/creditcard-icons.png and /dev/null differ diff --git a/lib/img/logos/cb.png b/lib/img/logos/cb.png new file mode 100644 index 0000000..8ac69b0 Binary files /dev/null and b/lib/img/logos/cb.png differ diff --git a/lib/img/logos/elv.png b/lib/img/logos/elv.png index f0d55c1..bb18ae5 100644 Binary files a/lib/img/logos/elv.png and b/lib/img/logos/elv.png differ diff --git a/lib/img/logos/sepa.png b/lib/img/logos/sepa.png new file mode 100644 index 0000000..b1971be Binary files /dev/null and b/lib/img/logos/sepa.png differ diff --git a/lib/img/payment_logos.png b/lib/img/payment_logos.png new file mode 100644 index 0000000..bc474e5 Binary files /dev/null and b/lib/img/payment_logos.png differ diff --git a/lib/img/tooltip.png b/lib/img/tooltip.png new file mode 100644 index 0000000..95a2597 Binary files /dev/null and b/lib/img/tooltip.png differ diff --git a/lib/img/tooltip_2.png b/lib/img/tooltip_2.png new file mode 100644 index 0000000..69fe27c Binary files /dev/null and b/lib/img/tooltip_2.png differ diff --git a/lib/integration/client.inc.php b/lib/integration/client.inc.php index e9fb1a0..6855286 100644 --- a/lib/integration/client.inc.php +++ b/lib/integration/client.inc.php @@ -8,33 +8,31 @@ class paymill_client{ public function __construct($client_email,$client_desc){ global $wpdb; + load_paymill(); // this function-call can and should be used whenever working with Paymill API - require_once(PAYMILL_DIR.'lib/api/Clients.php'); - - // create client object - $clientsObject = new Services_Paymill_Clients( - $GLOBALS['paymill_settings']->paymill_general_settings['api_key_private'], - $GLOBALS['paymill_settings']->paymill_general_settings['api_endpoint'] - ); - // get client cache - $query = 'SELECT * FROM '.$wpdb->prefix.'paymill_clients WHERE paymill_client_email="'.$client_email.'"'; - $client_cache = $wpdb->get_results($query,ARRAY_A); - $client = false; + $sql = $wpdb->prepare('SELECT * FROM '.$wpdb->prefix.'paymill_clients WHERE paymill_client_email=%s', + array( + $client_email + )); + + $client_cache = $wpdb->get_results($sql,ARRAY_A); if(count($client_cache) > 0 && ($client_cache[0]['paymill_client_email'] != $client_email || $client_cache[0]['paymill_client_description'] != $client_desc)){ // update client in paymill - $params = array( - 'id' => $client_cache[0]['paymill_client_id'], - 'email' => $client_email, - 'description' => $client_desc, - 'source' => serialize($GLOBALS['paymill_source']) - ); - $client = $clientsObject->update($params); + $GLOBALS['paymill_loader']->request_client->setId($client_cache[0]['paymill_client_id']); + $GLOBALS['paymill_loader']->request_client->setEmail($client_email); + $GLOBALS['paymill_loader']->request_client->setDescription($client_desc); + + // @todo: handle response + $client = $GLOBALS['paymill_loader']->request->update($GLOBALS['paymill_loader']->request_client); // update local cache - $query = 'UPDATE '.$wpdb->prefix.'paymill_clients SET paymill_client_description="'.$client_desc.'" WHERE paymill_client_email="'.$client_email.'"'; - $wpdb->query($query); + $wpdb->query($wpdb->prepare('UPDATE '.$wpdb->prefix.'paymill_clients SET paymill_client_description=%s WHERE paymill_client_email=%s', + array( + $client_desc, + $client_email + ))); do_action('paymill_paybutton_client_updated', array( 'client' => $client, @@ -44,16 +42,15 @@ public function __construct($client_email,$client_desc){ // try loading the client }elseif(count($client_cache) > 0){ - $client = $clientsObject->getOne($client_cache[0]['paymill_client_id']); - if($client['http_status_code'] == 404){ - $client = false; - } - } - if($client == false){ - $client = $clientsObject->create(array( - 'email' => $client_email, - 'description' => $client_desc - )); + $GLOBALS['paymill_loader']->request_client->setId($client_cache[0]['paymill_client_id']); + $client = $GLOBALS['paymill_loader']->request->getOne($GLOBALS['paymill_loader']->request_client); + // client does not exist in Paymill, so create + }else{ + $GLOBALS['paymill_loader']->request_client->setEmail($client_email); + $GLOBALS['paymill_loader']->request_client->setDescription($client_desc); + + // @todo: handle response + $client = $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_client); // insert new client in local cache if(get_current_user_id()){ @@ -61,9 +58,16 @@ public function __construct($client_email,$client_desc){ }else{ $user_id = 0; } - - $query = 'INSERT INTO '.$wpdb->prefix.'paymill_clients (paymill_client_id, paymill_client_email, paymill_client_description, wp_member_id) VALUES ("'.$client['id'].'", "'.$client_email.'", "'.$client_desc.'", "'.$user_id.'")'; - $wpdb->query($query); + + $wpdb->query($wpdb->prepare('INSERT INTO '.$wpdb->prefix.'paymill_clients + (paymill_client_id, paymill_client_email, paymill_client_description, wp_member_id) + VALUES (%s,%s,%s,%s)', + array( + $client->getId(), + $client_email, + $client_desc, + $user_id + ))); do_action('paymill_paybutton_client_created', array( 'client' => $client, @@ -71,7 +75,6 @@ public function __construct($client_email,$client_desc){ 'client_desc' => $client_desc )); } - $this->client = $client; } diff --git a/lib/integration/magicmembers.inc.php b/lib/integration/magicmembers.inc.php index 3d57a12..188d1db 100644 --- a/lib/integration/magicmembers.inc.php +++ b/lib/integration/magicmembers.inc.php @@ -4,6 +4,18 @@ * Paymill payment module */ + +if(!function_exists('paymill_mgm_errorHandling')){ + function paymill_mgm_errorHandling($errors){ + global $woocommerce; + + foreach($errors as $error){ + $output .= ''.$error.'
';
+ }
+
+ return $output;
+ }
+}
class mgm_paymill extends mgm_payment{
@@ -14,9 +26,10 @@ function __construct(){
$this->mgm_paymill();
}
-
// construct
function mgm_paymill(){
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+ $GLOBALS['paymill_loader']->paymill_errors->setFunction('paymill_mgm_errorHandling');
// parent
parent::__construct();
@@ -34,7 +47,7 @@ function mgm_paymill(){
$this->logo = plugins_url('',PAYMILL_DIR.'paymill.php').'/lib/img/logo.png';
// description
- $this->description = __('PAYMILL - Online payments made easy', 'mgm');
+ $this->description = __('PAYMILL - Online payments made easy', 'paymill');
// supported buttons types
$this->supported_buttons = array('subscription', 'buypost');
@@ -52,7 +65,7 @@ function mgm_paymill(){
$this->hosted_payment = 'Y';// credit card process onsite
// if supports rebill status check
- $this->supports_rebill_status_check = 'Y';
+ $this->supports_rebill_status_check = 'N';
// default settings
$this->_default_setting();
@@ -65,7 +78,6 @@ function mgm_paymill(){
}
// MODULE API COMMON HOOKABLE CALLBACKS //////////////////////////////////////////////////////////////////
-
// settings
function settings(){
@@ -81,7 +93,6 @@ function settings(){
$this->load->template('settings', array('data'=>$data));
}
-
// settings_box
function settings_box(){
@@ -96,7 +107,6 @@ function settings_box(){
// load template view
return $this->load->template('settings_box', array('data'=>$data), true);
}
-
// update
function settings_update(){
@@ -231,7 +241,6 @@ function settings_update(){
}
}
-
// return process api hook, link back to site after payment is made
function process_return(){
if(!isset($this->response)) $this->response = array();
@@ -265,17 +274,128 @@ function process_return(){
mgm_redirect(add_query_arg(array('status'=>'error','errors'=>urlencode($this->process_payment())), $this->_get_thankyou_url()));
}
}
+ private function getCurrentClient(){
+ require_once(PAYMILL_DIR.'lib/integration/client.inc.php');
+ // create or get client
+ $this->clientClass = new paymill_client($this->user->data->user_email,$this->user->data->user_login);
+ return $this->clientClass->getCurrentClient();
+ }
+ private function processSubscriptions(){
+ global $wpdb;
+
+ // product is a subscription?
+ if(isset($this->order['payment_type']) && $this->order['payment_type'] == 'subscription_purchase' &&
+ isset($this->durations[$this->order['duration_type']]) && strlen($this->durations[$this->order['duration_type']]) > 0){
+ // required vars
+ $trial_time = false; // MGM does not support trials?!
+
+ // set interval
+ $interval = $this->order['duration'].' '.$this->durations[$this->order['duration_type']];
+
+ // md5 name
+ $mgm_sub_md5 = md5($this->total.$this->order['currency'].$interval.$trial_time);
+
+ // get offer
+ $name = 'mgm_'.$this->order['pack_id'].'_'.$mgm_sub_md5;
+ $offer = $this->subscriptions->offerGetDetailByName($name);
+
+ // check wether offer exists in paymill
+ if($offer === false){
+ // offer does not exist in paymill yet, create it
+ $params = array(
+ 'amount' => $this->total,
+ 'currency' => $this->order['currency'],
+ 'interval' => $interval,
+ 'name' => $name,
+ 'trial_period_days' => intval($trial_time)
+ );
+ $offer = $this->subscriptions->offerCreate($params);
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ return false;
+ }
+ }
+
+ // create user subscription
+ $user_sub = $this->subscriptions->create($this->client->getId(), $offer['id'], $this->paymentClass->getPaymentID());
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ return false;
+ }else{
+ $wpdb->query($wpdb->prepare('INSERT INTO '.$wpdb->prefix.'paymill_subscriptions (paymill_sub_id, mgm_user_id, mgm_offer_id) VALUES (%s, %s, %s)',
+ array(
+ $user_sub,
+ get_current_user_id(),
+ $this->order['pack_id']
+ )));
+
+ // subscription successful
+ do_action('paymill_mgm_subscription_created', array(
+ 'product_id' => $this->order['pack_id'],
+ 'offer_id' => $offer['id'],
+ 'offer_data' => $offer
+ ));
+
+ return true;
+ }
+ }else{
+ return true;
+ }
+ }
+ private function processProducts(){
+ global $wpdb;
+ if($this->total > 0 && isset($this->order['payment_type']) && $this->order['payment_type'] == 'post_purchase' || (isset($this->order['num_cycles']) && $this->order['num_cycles'] == 1)){
+ // make transaction
+ $GLOBALS['paymill_loader']->request_transaction->setAmount(round($this->total)); // e.g. "4200" for 42.00 EUR
+ $GLOBALS['paymill_loader']->request_transaction->setCurrency($this->order['currency']);
+ if($this->paymentClass->getPreauthID() != false){
+ $GLOBALS['paymill_loader']->request_transaction->setPreauthorization($this->paymentClass->getPreauthID());
+ }else{
+ $GLOBALS['paymill_loader']->request_transaction->setPayment($this->paymentClass->getPaymentID());
+ }
+ $GLOBALS['paymill_loader']->request_transaction->setClient($this->client->getId());
+ $GLOBALS['paymill_loader']->request_transaction->setDescription($this->order_desc);
+ $GLOBALS['paymill_loader']->request->setSource(serialize($GLOBALS['paymill_source']));
+
+ $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_transaction);
+ $response = $GLOBALS['paymill_loader']->request->getLastResponse();
+
+ if(isset($response['body']['data']['response_code']) && $response['body']['data']['response_code'] != '20000'){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($response['body']['data']['response_code'], 'paymill'));
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ $GLOBALS['paymill_loader']->paymill_errors->getErrors();
+ }
+ return false;
+ }
+
+ // save data to transaction table
+ $wpdb->query($wpdb->prepare('
+ INSERT INTO '.$wpdb->prefix.'paymill_transactions (paymill_transaction_id, paymill_payment_id, paymill_client_id, mgm_order_id, paymill_transaction_time, paymill_transaction_data)
+ VALUES (%s,%s,%s,%d,%d,%s)',
+ array(
+ $response['body']['data']['id'],
+ $response['body']['data']['payment']['id'],
+ $response['body']['data']['client']['id'],
+ $this->order_id,
+ time(),
+ serialize($_POST)
+ )));
+
+ do_action('paymill_mgm_products_paid', array(
+ 'total' => $this->total,
+ 'currency' => $this->order['currency'],
+ 'client' => $response['body']['data']['client']['id']
+ ));
+
+ return true;
+ }else{ // total is zero, so just return true
+ return true;
+ }
+ }
// make payment
+ // @ PAYMILL
function process_payment(){
global $wpdb;
- //ini_set('display_errors',1);
- //error_reporting(E_ALL);
-
- //var_dump($_POST);
- // $_POST[''] array(3) { ["tran_id"]=> string(2) "29" ["submit_from"]=> string(21) "process_html_redirect" ["paymillToken"]=> string(24) "tok_8ae4ec7be24098a4ed77" }
-
//record POST/GET data
do_action('mgm_print_module_data', $this->module, __FUNCTION__ );
@@ -342,7 +462,6 @@ function process_payment(){
*/
$transaction = $this->_get_transaction_passthrough($_POST['tran_id']);
-
/*
var_dump(get_userdata($transaction['user_id']));
@@ -752,171 +871,84 @@ function process_payment(){
}
*/
- $user = get_userdata($transaction['user_id']);
-
- // first retrieve client data, either from cache or from API
- require_once(PAYMILL_DIR.'lib/integration/client.inc.php');
- $clientClass = new paymill_client(
- $user->data->user_email,
- $user->data->user_login
- );
-
- $client = $clientClass->getCurrentClient();
+ $this->user = get_userdata($transaction['user_id']);
+ $this->client = $this->getCurrentClient();
// client retrieved, now we are ready to process the payment
- if($client['id'] !== false && strlen($client['id']) > 0){
- require_once(PAYMILL_DIR.'lib/integration/payment.inc.php');
- //die('payment start');
- if(!isset($this->paymentClass)){
- $this->paymentClass = new paymill_payment($client['id']);
- }
-
- // mapping
- $durations = array(
- 'd' => 'DAY',
- 'w' => 'WEEK',
- 'm' => 'MONTH',
- 'y' => 'YEAR'
- );
+ if($this->client->getId() !== false && strlen($this->client->getId()) > 0){
+ $this->order_id = $_POST['tran_id'];
+ $this->order_desc = __('Order #','paymill').$this->order_id;
+ $this->order = $transaction;
+ $this->total_complete =
+ $this->total = round((floatval($transaction['cost'])*100));
+ // mapping
+ $this->durations = array(
+ 'd' => 'DAY',
+ 'w' => 'WEEK',
+ 'm' => 'MONTH',
+ 'y' => 'YEAR'
+ );
// l = lifetime // one time purchase
// dr = daterange // one time purchase
+
+ // load subscription class
+ $this->subscriptions = new paymill_subscriptions('mgm');
+ $this->offers = $this->subscriptions->offerGetList();
+
+ // get the totals for pre authorization
+ // $this->getTotals();
+
+ // create payment object and preauthorization
+ require_once(PAYMILL_DIR.'lib/integration/payment.inc.php');
+ $this->paymentClass = new paymill_payment($this->client->getId(),$this->total_complete,$this->order['currency']); // create payment object, as it should be used for next processing instead of the token.
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ $GLOBALS['paymill_loader']->paymill_errors->getErrors();
+ return false;
+ }
- // test vars
- /*var_dump($client['id']);
- var_dump($this->paymentClass->getPaymentID());
- var_dump(is_array($transaction));
- var_dump($transaction['payment_type']);
- var_dump(isset($durations[$transaction['duration_type']]));
- die();*/
-
- $paymentID = $this->paymentClass->getPaymentID();
-
- // make subscription
- if(
- isset($client['id']) && strlen($client['id']) > 0 &&
- isset($paymentID) && strlen($paymentID) > 0 &&
- is_array($transaction) && count($transaction) > 0 &&
- isset($transaction['payment_type']) && $transaction['payment_type'] == 'subscription_purchase' &&
- isset($durations[$transaction['duration_type']]) && strlen($durations[$transaction['duration_type']]) > 0
- ){
- $subscriptions = new paymill_subscriptions('magicmembers');
-
- // required vars
- $amount = (floatval($transaction['cost'])*100);
- $currency = $transaction['currency'];
-
- // set interval
- $interval = $transaction['duration'].' '.$durations[$transaction['duration_type']];
-
- // get trial time
- // $now = time();
- // $trial_end = strtotime(WC_Subscriptions_Product::get_trial_expiration_date($product['product_id'], get_gmt_from_date($order->order_date)));
- // $datediff = $trial_end - $now;
- // $trial_time = ceil($datediff/(60*60*24));
-
- $trial_time = false; // MGM does not support trials?!
-
- // md5 name
- $mgm_sub_md5 = md5($amount.$currency.$interval.$trial_time);
-
- // get offer
- $name = 'mgm_'.$transaction['pack_id'].'_'.$mgm_sub_md5;
- $offer = $subscriptions->offerGetDetailByName($name);
- $offer = $offer[0];
-
- // check wether offer exists in paymill
- if(count($offer) == 0){
- // offer does not exist in paymill yet, create it
- $params = array(
- 'amount' => $amount,
- 'currency' => $currency,
- 'interval' => $interval,
- 'name' => $name,
- 'trial_period_days' => $trial_time
- );
- $offer = $subscriptions->offerCreate($params);
-
- if(isset($offer['error']['messages'])){
- foreach($offer['error']['messages'] as $field => $msg){
- $woocommerce->add_error($field.': '.$msg);
- }
- return;
- }
- }
-
- // create user subscription
- $user_sub = $subscriptions->create($client['id'], $offer['id'], $paymentID);
+ // process subscriptions & products
+ if($this->processSubscriptions() && $this->processProducts()){
+ // success
+ // hook for pre process
+ $this->response['response_status'] = 'Approved';
- if(isset($user_sub['error']) && strlen($user_sub['error']) > 0){
- return __($user_sub['error'], 'paymill');
- }else{
- $query = 'INSERT INTO '.$wpdb->prefix.'paymill_subscriptions (paymill_sub_id, mgm_user_id, mgm_offer_id) VALUES ("'.$user_sub['id'].'", "'.$transaction['user_id'].'", "'.$transaction['pack_id'].'")';
- $wpdb->query($query);
-
- // subscription successful
- do_action('paymill_mgm_subscription_created', array(
- 'product_id' => $id,
- 'offer_id' => $offer['id'],
- 'offer_data' => $offer
- ));
- }
- }else{
- die('ende');
- if(!isset($client['id']) || strlen($client['id']) <= 0){
- $error .= 'no client ID: '.$client['id'].'
'; - } - if(!$paymentID){ - $error .= 'no payment ID: '.$paymentID.'
'; - } - if(!is_array($transaction) || count($transaction) <= 0){ - $error .= 'no transaction: '.count($transaction).'
'; - } - if(!isset($transaction['payment_type']) || $transaction['payment_type'] != 'subscription_purchase'){ - $error .= 'no supported payment type: '.$transaction['payment_type'].'
'; - } - if(!isset($durations[$transaction['duration_type']]) || strlen($durations[$transaction['duration_type']]) <= 0){ - $error .= 'no duration type: '.$durations[$transaction['duration_type']].'
'; - } - - - return 'payment initialization failed
'.$error; - } - }else{ - return 'client creation failed'; - } - - - // hook for pre process - do_action('mgm_notify_pre_process_'.$this->module, array('tran_id'=>$_POST['tran_id'],'custom'=>$transaction)); + do_action('mgm_notify_pre_process_'.$this->module, array('tran_id'=>$_POST['tran_id'],'custom'=>$transaction)); - // check - switch($transaction['payment_type']){ + // check + switch($transaction['payment_type']){ + // buypost + case 'post_purchase': + case 'buypost': + $this->_buy_post(); //run the code to process a purchased post/page - // buypost - case 'post_purchase': - case 'buypost': - $this->_buy_post(); //run the code to process a purchased post/page + break; - break; + // subscription + case 'subscription_purchase': + $this->_buy_membership(); //run the code to process a new/extended membership - // subscription - case 'subscription_purchase': - $this->_buy_membership(); //run the code to process a new/extended membership + break; + } - break; + // after process + do_action('mgm_notify_post_process_'.$this->module, array('tran_id'=>$_POST['tran_id'],'custom'=>$transaction)); + // after process unverified + do_action('mgm_notify_post_process_unverified_'.$this->module); + + return true; + }else{ + if($GLOBALS['paymill_loader']->paymill_errors->status()){ + $GLOBALS['paymill_loader']->paymill_errors->getErrors(); + } + return false; + } + }else{ + $GLOBALS['paymill_loader']->paymill_errors->setError(__('There was an issue with adding you as client for the payment process.', 'paymill')); + return false; } - - // after process - do_action('mgm_notify_post_process_'.$this->module, array('tran_id'=>$_POST['tran_id'],'custom'=>$transaction)); - - // after process unverified - do_action('mgm_notify_post_process_unverified_'.$this->module); - - return true; } - // process cancel api hook function process_cancel(){ @@ -925,7 +957,6 @@ function process_cancel(){ mgm_redirect(add_query_arg(array('status'=>'cancel'), $this->_get_thankyou_url())); } - // unsubscribe process, proxy for unsubscribe function process_unsubscribe() { @@ -1015,7 +1046,6 @@ function process_unsubscribe() { mgm_redirect(mgm_get_custom_url('membership_details', false,array('unsubscribe_errors'=>urlencode($message)))); } - // PAYMENT CALL - payment starts here function process_credit_card(){ @@ -1294,10 +1324,10 @@ function process_credit_card(){ // $this->process_return(); } - // process html_redirect, proxy for form submit //The credit card form will get submitted to the same function, then validate the card and if everything is clear //() will be called internally + // @ PAYMILL function process_html_redirect(){ // read tran id @@ -1378,6 +1408,8 @@ function process_html_redirect(){ ob_start(); if(!$GLOBALS['paymill_active']){ + paymill_load_frontend_scripts(); // load frontend scripts + // settings $GLOBALS['paymill_active'] = true; $country = 'DE'; @@ -1410,9 +1442,9 @@ function process_html_redirect(){ return $html; - } - + } // subscribe button api hook + // @ PAYMILL function get_button_subscribe($options=array()){ $include_permalink = (isset($options['widget'])) ? false : true; @@ -1441,8 +1473,8 @@ function get_button_subscribe($options=array()){ return $html; } - // buypost button api hook + // @ PAYMILL function get_button_buypost($options=array(), $return = false) { // get html @@ -1477,7 +1509,6 @@ function get_button_buypost($options=array(), $return = false) { } } - // unsubscribe button api hook function get_button_unsubscribe($options=array()){ @@ -1514,7 +1545,6 @@ function get_button_unsubscribe($options=array()){ return $html; } - // get module transaction info function get_transaction_info($member, $date_format){ @@ -1542,7 +1572,7 @@ function get_transaction_info($member, $date_format){ // info - $info = sprintf('%s:%s: %s
%s: %s', __('AUTHORIZE.NET INFO','mgm'), __('SUBSCRIPTION ID','mgm'), $subscription_id, + $info = sprintf('%s:
%s: %s
%s: %s', __('Paymill INFO','paymill'), __('SUBSCRIPTION ID','mgm'), $subscription_id, __('TRANSACTION ID','mgm'), $transaction_id); @@ -1557,7 +1587,6 @@ function get_transaction_info($member, $date_format){ return $transaction_info; } - /** * get gateway tracking fields for sync @@ -1567,7 +1596,6 @@ function get_transaction_info($member, $date_format){ * @todo process another subscription */ - function get_tracking_fields_html(){ // html @@ -1585,7 +1613,6 @@ function get_tracking_fields_html(){ return $html; } - /** * update and sync gateway tracking fields @@ -1601,7 +1628,6 @@ function get_tracking_fields_html(){ * @uses _save_tracking_fields() */ - function update_tracking_fields($post_data, &$member){ // validate @@ -1623,11 +1649,7 @@ function update_tracking_fields($post_data, &$member){ return $this->_save_tracking_fields($fields, $member, $data); } - - - // MODULE API COMMON PRIVATE HELPERS ///////////////////////////////////////////////////////////////// - // get button data function _get_button_data($pack, $tran_id=NULL) { @@ -1786,12 +1808,8 @@ function _get_button_data($pack, $tran_id=NULL) { return $data; } - // buy post @todo !!! function _buy_post() { - - - global $wpdb; // system @@ -1842,7 +1860,7 @@ function _buy_post() { // response code - $response_code = $this->_get_response_code($this->response['response_status'], 'status'); + $response_code = $this->response['response_status']; // process on response code @@ -2097,7 +2115,6 @@ function _buy_post() { } } - function _get_alternate_transaction_id(){ // var @@ -2123,7 +2140,6 @@ function _get_alternate_transaction_id(){ return $alt_tran_id; } - // buy membership @todo !!! function _buy_membership() { @@ -2833,7 +2849,6 @@ function _buy_membership() { } } - // cancel membership function _cancel_membership($user_id, $redirect = false){ @@ -3068,9 +3083,6 @@ function _cancel_membership($user_id, $redirect = false){ } } - - - /** * Cancel Recurring Subscription @@ -3179,15 +3191,13 @@ function cancel_recurring_subscription($trans_ref = null, $user_id = null, $subs //only for subscription_purchase if($pack_id && $user_id){ - $userInfo = get_userdata($user_id); - $subscriptions = new paymill_subscriptions('magicmembers'); - + $query = 'SELECT paymill_sub_id FROM '.$wpdb->prefix.'paymill_subscriptions WHERE mgm_user_id="'.$user_id.'" AND mgm_offer_id="'.$pack_id.'"'; $client_cache = $wpdb->get_results($query,ARRAY_A); if(isset($client_cache[0]['paymill_sub_id']) && strlen($client_cache[0]['paymill_sub_id']) > 0){ - $subscriptions->remove($client_cache[0]['paymill_sub_id']); + $this->subscriptions->remove($client_cache[0]['paymill_sub_id']); $query = 'DELETE FROM '.$wpdb->prefix.'paymill_subscriptions WHERE mgm_user_id="'.$user_id.'" AND mgm_offer_id="'.$pack_id.'"'; $wpdb->query($query); @@ -3201,9 +3211,6 @@ function cancel_recurring_subscription($trans_ref = null, $user_id = null, $subs return false; } - - - /** * Specifically check recurring status of each rebill for an expiry date @@ -3217,7 +3224,6 @@ function cancel_recurring_subscription($trans_ref = null, $user_id = null, $subs * @return boolean */ - function query_rebill_status($user_id, $member=NULL) { // check @@ -3483,7 +3489,6 @@ function query_rebill_status($user_id, $member=NULL) { return false;//default to false to skip normal modules } - // get transaction function get_transaction_details($member){ @@ -3548,7 +3553,6 @@ function get_transaction_details($member){ return $response; } - // default setting function _default_setting(){ @@ -3575,7 +3579,6 @@ function _default_setting(){ $this->_setup_callback_urls(); } - // log transaction function _log_transaction(){ @@ -3632,7 +3635,6 @@ function _log_transaction(){ return false; } - // get tran id function _get_transaction_id(){ diff --git a/lib/integration/pay_button.inc.php b/lib/integration/pay_button.inc.php index d8311ab..6c68b91 100644 --- a/lib/integration/pay_button.inc.php +++ b/lib/integration/pay_button.inc.php @@ -1,132 +1,188 @@
'.__('Error:', 'paymill').'
';
+
+ foreach($errors as $error){
+ $output .= ''.$error.'
';
+ }
+
+ $output .= '';
+
+ return $output;
+ }
+ }
+
+ class paymill_pay_button_processPayment{
+ private $order_id = false;
+ private $order_desc = '';
+ private $total = 0;
+ private $total_complete = 0;
+ private $client = false;
+ private $paymentClass = false;
- // first retrieve client data, either from cache or from API
+ public function __construct(){
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+ $GLOBALS['paymill_loader']->paymill_errors->setFunction('paymill_pay_button_errorHandling');
+ $GLOBALS['paymill_source']['pay_button_version'] = PAYMILL_VERSION;
+ $this->order_id = time();
+ $this->order_desc = apply_filters('paymill_paybutton_order_desc', __('Order', 'paymill').' #'.$this->order_id, array($this->order_id, $_POST));
+ }
+ private function getCurrentClient(){
require_once(PAYMILL_DIR.'lib/integration/client.inc.php');
- $clientClass = new paymill_client(
- $_POST['email'],
- $_POST['forename'].' '.$_POST['surname']
- );
+ if(isset($_POST['forename']) && isset($_POST['surname'])){
+ $desc = $_POST['forename'].' '.$_POST['surname'];
+ }elseif(isset($_POST['forename'])){
+ $desc = $_POST['forename'];
+ }elseif(isset($_POST['surname'])){
+ $desc = $_POST['surname'];
+ }else{
+ $desc = '';
+ }
- $client = $clientClass->getCurrentClient();
+ $desc = apply_filters('paymill_paybutton_client_desc', $desc, array($this->order_id, $_POST));
- // client retrieved, now we are ready to process the payment
- if($client['id'] !== false && strlen($client['id']) > 0){
- require_once(PAYMILL_DIR.'lib/integration/payment.inc.php');
+ // create or get client
+ $this->clientClass = new paymill_client($_POST['email'],$desc);
+ return $this->clientClass->getCurrentClient();
+ }
+ private function getTotals(){
+ // load subscription class
+ $this->subscriptions = new paymill_subscriptions('pay_button');
+ $offers = $this->subscriptions->offerGetList();
+
+ foreach($_POST['paymill_quantity'] as $id => $quantity){
+ if(
+ isset($GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$id]['products_offer']) &&
+ isset($offers[$GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$id]['products_offer']]['amount']) &&
+ floatval($offers[$GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$id]['products_offer']]['amount']) > 0
+ ){
+ // retrieve subscription amount
+ $amount = floatval(
+ floatval($offers[$GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$id]['products_offer']]['amount'])
+ *intval($quantity)
+ );
+ }else{
+ // retrieve product amount
+ $amount = floatval(
+ floatval($GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$id]['products_price'])
+ *intval($quantity)
+ *100
+ );
+ $this->total = $this->total+$amount;
+ }
- $paymentClass = new paymill_payment($client['id']);
- // calculate total based on product settings
- if(isset($_POST['paymill_quantity']) && count($_POST['paymill_quantity']) > 0){
- $total = 0;
- $subscriptions = false;
- foreach($_POST['paymill_quantity'] as $id => $quantity){
- // item is subscription, so don't add amount to total calculation
- if(isset($_POST['paymill_offer'][$id])){
- // create subscription
- if(isset($_POST['paymill_quantity'][$id]) && $_POST['paymill_quantity'][$id] == 1){
- if($subscriptions === false){
- $subscriptions = new paymill_subscriptions('pay_button');
- }
-
- $offer = $subscriptions->create($client['id'], $_POST['paymill_offer'][$id], $paymentClass->getPaymentID());
-
- //var_dump($offer);
- // offer cannot be subscribed.
- if(isset($offer['error']) && strlen($offer['error']) > 0){
- echo __($offer['error'], 'paymill');
- die();
- }else{ // subscription successful
- do_action('paymill_paybutton_subscription_created', array(
- 'product_id' => $id,
- 'offer_id' => $_POST['paymill_offer'][$id],
- 'offer_data' => $offer
- ));
- }
- }
- }else{
- // retrieve product price and add to total
- $total = ($total+floatval($GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$id]['price'])*intval($quantity));
- }
- }
- // now we have total amount of all non-subscription products. Time to make transaction.
- if($total > 0){
- $transactionsObject = new Services_Paymill_Transactions($GLOBALS['paymill_settings']->paymill_general_settings['api_key_private'], $GLOBALS['paymill_settings']->paymill_general_settings['api_endpoint']);
-
- $order_id = time();
+ $this->total_complete = $this->total_complete+$amount;
+ }
- // make transaction
- $order_desc = apply_filters( 'paymill_paybutton_order_desc', __('Order', 'paymill').' #'.$order_id."\n\n", array($order_id, $transaction, $_POST, $order_mail));
-
- $params = array(
- 'amount' => $total*100, // e.g. "4200" for 42.00 EUR
- 'currency' => $GLOBALS['paymill_settings']->paymill_general_settings['currency'], // ISO 4217
- 'payment' => $paymentClass->getPaymentID(),
- 'client' => $client['id'],
- 'description' => $order_desc,
- 'source' => serialize($GLOBALS['paymill_source'])
- );
- $transaction = $transactionsObject->create($params);
+ // add shipping rate
+ if(isset($_POST['paymill_shipping']) && strlen($_POST['paymill_shipping']) > 0){
+ $shipping_costs = (floatval($GLOBALS['paymill_settings']->paymill_pay_button_settings['flat_shipping'][intval($_POST['paymill_shipping'])]['flat_shipping_costs'])*100);
+ $this->total = $this->total+$shipping_costs;
+ $this->total_complete = $this->total_complete+$shipping_costs;
+ }
+ }
+ private function processSubscriptions(){
+ foreach($_POST['paymill_quantity'] as $id => $quantity){
+ if(isset($_POST['paymill_offer'][$id])){
+ // create subscription
+ if(isset($_POST['paymill_quantity'][$id]) && $_POST['paymill_quantity'][$id] == 1){
+ $offer = $this->subscriptions->create($this->client->getId(), $_POST['paymill_offer'][$id], $this->paymentClass->getPaymentID());
- $response = $transactionsObject->getResponse();
- if(isset($response['body']['data']['response_code']) && $response['body']['data']['response_code'] != '20000'){
- echo __($response['body']['data']['response_code'], 'paymill');
- die();
+ // offer cannot be subscribed.
+ if($offer === false){
+ return false;
+ }else{ // subscription successful
+ do_action('paymill_paybutton_subscription_created', array(
+ 'product_id' => $id,
+ 'offer_id' => $_POST['paymill_offer'][$id],
+ 'offer_data' => $offer
+ ));
}
-
- // save data to transaction table
- $query = 'INSERT INTO '.$wpdb->prefix.'paymill_transactions (paymill_transaction_id, paymill_payment_id, paymill_client_id, pay_button_order_id, paymill_transaction_time, paymill_transaction_data) VALUES ("'.$transaction['id'].'", "'.$transaction['payment']['id'].'", "'.$transaction['client']['id'].'", "'.$order_id.'", "'.$order_id.'", "'.$wpdb->escape(serialize($_POST)).'")';
- $wpdb->query($query);
-
- do_action('paymill_paybutton_products_paid', array(
- 'total' => $total,
- 'currency' => $GLOBALS['paymill_settings']->paymill_general_settings['currency'],
- 'client' => $client['id']
- ));
}
-
+ }else{ // no subscriptions in cart, so just return true
+ return true;
}
- }else{
- echo __('There was an issue with adding you as client for the payment process.', 'paymill');
- die();
}
-
- // order complete
- do_action( 'paymill_paybutton_order_complete', array($order_id, $transaction, $_POST) );
-
- // prepare order confirmation mail
- if(!isset($order_desc)){
- $order_desc = '';
+ return true;
+ }
+ private function processProducts(){
+ global $wpdb;
+ if($this->total > 0){
+ // make transaction
+ $GLOBALS['paymill_loader']->request_transaction->setAmount(round($this->total)); // e.g. "4200" for 42.00 EUR
+ $GLOBALS['paymill_loader']->request_transaction->setCurrency($GLOBALS['paymill_settings']->paymill_pay_button_settings['currency']);
+ if($this->paymentClass->getPreauthID() != false){
+ $GLOBALS['paymill_loader']->request_transaction->setPreauthorization($this->paymentClass->getPreauthID());
+ }else{
+ $GLOBALS['paymill_loader']->request_transaction->setPayment($this->paymentClass->getPaymentID());
+ }
+ $GLOBALS['paymill_loader']->request_transaction->setClient($this->client->getId());
+ $GLOBALS['paymill_loader']->request_transaction->setDescription($this->order_desc);
+ $GLOBALS['paymill_loader']->request->setSource(serialize($GLOBALS['paymill_source']));
+
+ $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_transaction);
+
+ $response = $GLOBALS['paymill_loader']->request->getLastResponse();
+
+ if(isset($response['body']['data']['response_code']) && $response['body']['data']['response_code'] != '20000'){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($response['body']['data']['response_code'], 'paymill'));
+ return false;
+ }
+
+ // save data to transaction table
+ $wpdb->query($wpdb->prepare('
+ INSERT INTO '.$wpdb->prefix.'paymill_transactions (paymill_transaction_id, paymill_payment_id, paymill_client_id, pay_button_order_id, paymill_transaction_time, paymill_transaction_data)
+ VALUES (%s,%s,%s,%d,%d,%s)',
+ array(
+ $response['body']['data']['id'],
+ $response['body']['data']['payment']['id'],
+ $response['body']['data']['client']['id'],
+ $this->order_id,
+ $this->order_id,
+ serialize($_POST)
+ )));
+
+ do_action('paymill_paybutton_products_paid', array(
+ 'total' => $this->total,
+ 'currency' => $GLOBALS['paymill_settings']->paymill_pay_button_settings['currency'],
+ 'client' => $response['body']['data']['client']['id']
+ ));
+
+ return true;
+ }else{ // total is zero, so just return true
+ return true;
}
+ }
+ private function sendMail(){
+ $this->order_desc .= "\n\n";
// customer details
- $email_customer_desc = __('Company Name', 'paymill').': '.strip_tags($_POST['company_name'])."\n".
- __('Forename', 'paymill').': '.strip_tags($_POST['forename'])."\n".
- __('Surname', 'paymill').': '.strip_tags($_POST['surname'])."\n".
- __('Street', 'paymill').': '.strip_tags($_POST['street'])."\n".
- __('Number', 'paymill').': '.strip_tags($_POST['number'])."\n".
- __('ZIP', 'paymill').': '.strip_tags($_POST['zip'])."\n".
- __('City', 'paymill').': '.strip_tags($_POST['city'])."\n".
- __('Country', 'paymill').': '.strip_tags($_POST['paymill_shipping'])."\n".
- __('Email', 'paymill').': '.strip_tags($_POST['email'])."\n".
- __('Phone', 'paymill').': '.strip_tags($_POST['phone'])."\n\n";
+ $email_customer_desc =
+ (isset($_POST['company_name']) ? (__('Company Name', 'paymill').': '.strip_tags($_POST['company_name'])."\n") : '').
+ (isset($_POST['forename']) ? (__('Forename', 'paymill').': '.strip_tags($_POST['forename'])."\n") : '').
+ (isset($_POST['surname']) ? (__('Surname', 'paymill').': '.strip_tags($_POST['surname'])."\n") : '').
+ (isset($_POST['street']) ? (__('Street', 'paymill').': '.strip_tags($_POST['street'])."\n") : '').
+ (isset($_POST['number']) ? (__('Number', 'paymill').': '.strip_tags($_POST['number'])."\n") : '').
+ (isset($_POST['zip']) ? (__('ZIP', 'paymill').': '.strip_tags($_POST['zip'])."\n") : '').
+ (isset($_POST['city']) ? (__('City', 'paymill').': '.strip_tags($_POST['city'])."\n") : '').
+ (isset($_POST['paymill_shipping']) && isset($GLOBALS['paymill_settings']->paymill_pay_button_settings['flat_shipping'][$_POST['paymill_shipping']]) ? (__('Country', 'paymill').': '.strip_tags($GLOBALS['paymill_settings']->paymill_pay_button_settings['flat_shipping'][$_POST['paymill_shipping']]['flat_shipping_country'])."\n") : '').
+ (isset($_POST['email']) ? (__('Email', 'paymill').': '.strip_tags($_POST['email'])."\n") : '').
+ (isset($_POST['phone']) ? (__('Phone', 'paymill').': '.strip_tags($_POST['phone'])."\n") : '');
// products details
+ $order_products = '';
foreach($_POST['paymill_quantity'] as $product => $quantity){
if(intval($quantity) > 0){
- $order_products .= $quantity.'x '.$GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$product]['title']."\n";
+ $order_products .= $quantity.'x '.$GLOBALS['paymill_settings']->paymill_pay_button_settings['products'][$product]['products_title']."\n";
}
}
- $order_mail = $order_desc.$email_customer_desc.$order_products;
+ $order_mail = $this->order_desc.$email_customer_desc.$order_products;
// allow filtering the order email
- $order_mail = apply_filters( 'paymill_paybutton_email_text', $order_mail, array($order_id, $transaction, $_POST, $order_mail));
+ $order_mail = apply_filters( 'paymill_paybutton_email_text', $order_mail, array($this->order_id, $_POST, $order_mail));
// send confirmation mail
wp_mail(
@@ -143,17 +199,56 @@ function paymill_pay_button_process_payment(){
);
// order complete
- do_action( 'paymill_paybutton_email_sent', array($order_id, $transaction, $_POST, $order_mail) );
-
- // success, redirect if thankyou url is set
- if(isset($GLOBALS['paymill_settings']->paymill_pay_button_settings['thankyou_url']) && strlen($GLOBALS['paymill_settings']->paymill_pay_button_settings['thankyou_url']) > 0){
- header('Location: '.$GLOBALS['paymill_settings']->paymill_pay_button_settings['thankyou_url']);
- die();
+ do_action('paymill_paybutton_email_sent', array($this->order_id, $_POST, $order_mail));
+ }
+ public function process_payment(){
+ global $wpdb;
+ if(isset($_POST['paymill_quantity']) && count($_POST['paymill_quantity']) > 0){
+ $this->client = $this->getCurrentClient();
+
+ // client retrieved, now we are ready to process the payment
+ if($this->client->getId() !== false && strlen($this->client->getId()) > 0){
+ // get the totals for pre authorization
+ $this->getTotals();
+
+ // create payment object and preauthorization
+ require_once(PAYMILL_DIR.'lib/integration/payment.inc.php');
+ $this->paymentClass = new paymill_payment($this->client->getId(),$this->total_complete,$GLOBALS['paymill_settings']->paymill_pay_button_settings['currency']); // create payment object, as it should be used for next processing instead of the token.
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ return false;
+ }
+
+ // process subscriptions & products
+ if($this->processSubscriptions() && $this->processProducts()){
+ // order complete
+ do_action('paymill_paybutton_order_complete', array($this->order_id, $_POST));
+
+ // prepare order confirmation mail
+ $this->sendMail();
+
+ // success, redirect if thankyou url is set
+ if(isset($GLOBALS['paymill_settings']->paymill_pay_button_settings['thankyou_url']) && strlen($GLOBALS['paymill_settings']->paymill_pay_button_settings['thankyou_url']) > 0){
+ header('Location: '.$GLOBALS['paymill_settings']->paymill_pay_button_settings['thankyou_url']);
+ die();
+ }else{ // shpw thank you message and hide form
+ define('PAYMILL_PAYBUTTON_ORDER_SUCCESS', true);
+ }
+ }else{
+ return false;
+ }
+ }else{
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__('There was an issue with adding you as client for the payment process.', 'paymill'));
+ return false;
+ }
}
}
}
-
- add_action('plugins_loaded', 'paymill_pay_button_process_payment');
+ if(isset($_REQUEST['paymill_pay_button_order']) && $_REQUEST['paymill_pay_button_order'] == 1){
+ add_action('plugins_loaded', function(){
+ $class = new paymill_pay_button_processPayment();
+ $class->process_payment();
+ });
+ }
class paymill_pay_button_widget extends WP_Widget{
var $subscriptions = false;
@@ -161,6 +256,9 @@ class paymill_pay_button_widget extends WP_Widget{
/** constructor */
function __construct() {
parent::WP_Widget('paymill_pay_button_widget', 'Paymill Pay Button', array( 'description' => __('Shows a Paymill Payment Button.', 'paymill')));
+
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+ $GLOBALS['paymill_loader']->paymill_errors->setFunction('paymill_pay_button_errorHandling');
}
function widget($args, $instance){
global $wpdb;
@@ -169,6 +267,8 @@ function widget($args, $instance){
isset($GLOBALS['paymill_settings']->paymill_pay_button_settings['products']) &&
count($GLOBALS['paymill_settings']->paymill_pay_button_settings['products']) > 0
){
+ paymill_load_frontend_scripts(); // load frontend scripts
+
$GLOBALS['paymill_active'] = true;
echo $args['before_widget'];
@@ -176,20 +276,20 @@ function widget($args, $instance){
if(strlen($instance['title']) > 0){
echo $args['before_title']; ?>paymill_general_settings['currency'];
- $cc_logo = plugins_url('',__FILE__ ).'/../img/cc_logos_v.png';
- $title = apply_filters( 'widget_title', $instance['title'] );
-
+ $currency = $GLOBALS['paymill_settings']->paymill_pay_button_settings['currency'];
+ $cc_logo = plugins_url('',__FILE__ ).'/../img/cc_logos_v.png';
+ $title = apply_filters( 'widget_title', $instance['title'] );
+ $show_fields = isset($GLOBALS['paymill_settings']->paymill_pay_button_settings['fields_show']) ? $GLOBALS['paymill_settings']->paymill_pay_button_settings['fields_show'] : false;
+
if(isset($instance['products_list']) && strlen($instance['products_list']) > 0){
-
- $products_whitelist = explode(',',$instance['products_list']);
+ $products_whitelist = explode(',',$instance['products_list']);
}else{
- $products_whitelist = unserialize($instance['products']);
+ $products_whitelist = unserialize($instance['products']);
}
// form ids
@@ -203,19 +303,28 @@ function widget($args, $instance){
$this->subscriptions = new paymill_subscriptions('pay_button');
}
$offers = $this->subscriptions->offerGetList();
-
+
// html / icons
- echo '
+
+ ';
}
echo $args['after_widget'];
@@ -250,8 +359,8 @@ function form($instance) {
';
foreach($GLOBALS['paymill_settings']->paymill_pay_button_settings['products'] as $id => $product){
- if(strlen($product['title']) > 0){
- echo '';
+ if(strlen($product['products_title']) > 0){
+ echo '';
}
}
echo '
@@ -262,11 +371,9 @@ function form($instance) {
';
}
}
-
add_action('widgets_init', create_function('','register_widget("paymill_pay_button_widget");'));
// creating shortcodes
- // [sv_cb foo="foo-value"]
function paymill_pay_button_shortcode($atts){
ob_start();
the_widget('paymill_pay_button_widget',$atts,$args);
diff --git a/lib/integration/payment.inc.php b/lib/integration/payment.inc.php
index 483f0c5..1ce95d7 100644
--- a/lib/integration/payment.inc.php
+++ b/lib/integration/payment.inc.php
@@ -5,30 +5,49 @@
class paymill_payment{
private $paymentData = false;
+ private $preauthData = false;
+
+ public function __construct($client_id,$amount,$currency){
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_payment'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
- public function __construct($client_id){
if($this->paymentData === false){
- require_once(PAYMILL_DIR.'lib/api/Payments.php');
-
- // create payment object for future transactions and/or subscriptions
- $paymentsObject = new Services_Paymill_Payments(
- $GLOBALS['paymill_settings']->paymill_general_settings['api_key_private'],
- $GLOBALS['paymill_settings']->paymill_general_settings['api_endpoint']
- );
+ try{
+ $GLOBALS['paymill_loader']->request_payment->setToken($_POST['paymillToken']);
+ $GLOBALS['paymill_loader']->request_payment->setClient($client_id);
- $paymentsParam = array(
- 'token' => $_POST['paymillToken'],
- 'client' => $client_id
- );
-
- $this->paymentData = $paymentsObject->create($paymentsParam); // Use this for other payment
+ $this->paymentData = $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_payment); // Use this for further payment processing
+
+ if(is_object($this->paymentData) && $this->paymentData->getType() == 'creditcard'){
+ $GLOBALS['paymill_loader']->request_preauth->setPayment($this->getPaymentID());
+ $GLOBALS['paymill_loader']->request_preauth->setAmount(round($amount));
+ $GLOBALS['paymill_loader']->request_preauth->setCurrency($currency);
+
+ $this->preauthData = $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_preauth); // Use this for further payment processing, too
+ }
+ }catch(Exception $e){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($e->getMessage(),'paymill'));
+ }
}
+
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_payment'); // benchmark
}
public function getPaymentID(){
- return $this->paymentData['id'];
+ if(is_object($this->paymentData)){
+ return $this->paymentData->getId();
+ }else{
+ return false;
+ }
}
+ public function getPreauthID(){
+ if(is_object($this->preauthData)){
+ return $this->preauthData->getId();
+ }else{
+ return false;
+ }
+ }
}
?>
\ No newline at end of file
diff --git a/lib/integration/shopplugin.inc.php b/lib/integration/shopplugin.inc.php
index a76f396..e5c7809 100644
--- a/lib/integration/shopplugin.inc.php
+++ b/lib/integration/shopplugin.inc.php
@@ -1,4 +1,19 @@
'.$error.'';
+ }
+
+ return $output;
+ }
+ }
+
+
+
class PaymillShopp extends GatewayFramework implements GatewayModule {
// Settings
@@ -6,18 +21,19 @@ class PaymillShopp extends GatewayFramework implements GatewayModule {
var $saleonly = true; // force sale event on processing (no auth)
var $recurring = false; // support for recurring payment
- function __construct () {
+ function __construct(){
parent::__construct();
-
+
+ $GLOBALS['paymill_loader']->paymill_errors->setFunction('paymill_shopp_errorHandling');
+
if (!isset($this->settings['label'])){
- $this->settings['label'] = "Paymill";
+ $this->settings['label'] = 'Paymill';
}
add_action('shopp_paymillshopp_sale',array(&$this,'sale')); // Process sales
$GLOBALS['paymill_source']['shopp_version'] = SHOPP_VERSION;
}
-
/**
* actions
*
@@ -31,17 +47,16 @@ function __construct () {
**/
function actions () {
//add_action('shopp_process_checkout', array($this,'process')); // intercept checkout request, force confirm
-
-
add_filter( 'shopp_checkout_gateway_inputs', array($this,'form'),10,2);
}
-
function form(){
if(!$GLOBALS['paymill_active']){
+ paymill_load_frontend_scripts(); // load frontend scripts
+
// settings
$GLOBALS['paymill_active'] = true;
$cart_total = $this->amount('total')*100;
- $currency = $GLOBALS['paymill_settings']->paymill_general_settings['currency'];
+ $currency = $this->currency();
$cc_logo = plugins_url('',__FILE__ ).'/../img/cc_logos_v.png';
$no_logos = true;
@@ -54,9 +69,7 @@ function form(){
// html / icons
echo '';
-
$icon = '.'/../img/logo.png){kind=logo}
';
-
if(isset($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) && is_array($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) && count($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) > 0){
foreach($GLOBALS['paymill_settings']->paymill_general_settings['payments_display'] as $name => $type){
if($type==1){
@@ -64,103 +77,160 @@ function form(){
}
}
}
-
echo $icon;
-
echo '
';
-
require_once(PAYMILL_DIR.'lib/tpl/checkout_form.php');
-
echo '
';
-
}else{
echo 'Error: Paymill can be loaded once only on the same page.
';
}
}
-
- function sale ($Event) {
+ private function getCurrentClient(){
+ require_once(PAYMILL_DIR.'lib/integration/client.inc.php');
+ if(isset($this->order->Customer->firstname) && isset($this->order->Customer->lastname)){
+ $desc = $this->order->Customer->firstname.' '.$this->order->Customer->lastname;
+ }elseif(isset($_POST['billing_first_name'])){
+ $desc = $this->order->Customer->firstname;
+ }elseif(isset($_POST['billing_last_name'])){
+ $desc = $this->order->Customer->lastname;
+ }else{
+ $desc = '';
+ }
+
+ // create or get client
+ $this->clientClass = new paymill_client($this->order->Customer->email,$desc);
+ return $this->clientClass->getCurrentClient();
+ }/*
+ private function getTotals(){
+ $this->total = $this->Order->Cart->Totals;
+ $this->total_complete = $this->Order->Cart->Totals;
+ }*/
+ private function processSubscriptions(){
+ // subscriptions for shopp not yet supported.
+ return true;
+ }
+ private function processProducts(){
global $wpdb;
+ if($this->total > 0){
+ // make transaction
+ $GLOBALS['paymill_loader']->request_transaction->setAmount(round($this->total)); // e.g. "4200" for 42.00 EUR
+ $GLOBALS['paymill_loader']->request_transaction->setCurrency($this->currency());
+ if($this->paymentClass->getPreauthID() != false){
+ $GLOBALS['paymill_loader']->request_transaction->setPreauthorization($this->paymentClass->getPreauthID());
+ }else{
+ $GLOBALS['paymill_loader']->request_transaction->setPayment($this->paymentClass->getPaymentID());
+ }
+ $GLOBALS['paymill_loader']->request_transaction->setClient($this->client->getId());
+ $GLOBALS['paymill_loader']->request_transaction->setDescription($this->order_desc);
+ $GLOBALS['paymill_loader']->request->setSource(serialize($GLOBALS['paymill_source']));
+
+ $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_transaction);
- $order = $this->Order;
- $orderTotals = $order->Cart->Totals;
- $Billing = $order->Billing;
- $Paymethod = $order->paymethod();
-
-
- // first retrieve client data, either from cache or from API
- require_once(PAYMILL_DIR.'lib/integration/client.inc.php');
- $clientClass = new paymill_client(
- $order->Customer->email,
- $order->Customer->firstname.' '.$order->Customer->lastname
- );
+ $response = $GLOBALS['paymill_loader']->request->getLastResponse();
+
+ if(isset($response['body']['data']['response_code']) && $response['body']['data']['response_code'] != '20000'){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($response['body']['data']['response_code'], 'paymill'));
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ $GLOBALS['paymill_loader']->paymill_errors->getErrors();
+ }
+ return false;
+ }
+
+ // save data to transaction table
+ $wpdb->query($wpdb->prepare('
+ INSERT INTO '.$wpdb->prefix.'paymill_transactions (paymill_transaction_id, paymill_payment_id, paymill_client_id, pay_button_order_id, paymill_transaction_time, paymill_transaction_data)
+ VALUES (%s,%s,%s,%d,%d,%s)',
+ array(
+ $response['body']['data']['id'],
+ $response['body']['data']['payment']['id'],
+ $response['body']['data']['client']['id'],
+ $this->order_id,
+ $this->order_id,
+ serialize($_POST)
+ )));
+
+ do_action('paymill_paybutton_products_paid', array(
+ 'total' => $this->total,
+ 'currency' => $this->currency(),
+ 'client' => $response['body']['data']['client']['id']
+ ));
+
+ return true;
+ }else{ // total is zero, so just return true
+ return true;
+ }
+ }
+ function sale ($Event) {
+ global $wpdb;
- $client = $clientClass->getCurrentClient();
+ $this->order_id = $Event->order;
+ $this->order_desc = __('Order #','paymill').$this->order_id;
+ $this->order = $this->Order;
+ $this->cart = $this->order->Cart;
+ $this->total_complete = round((floatval($Event->amount)*100));
+ $this->total = $this->total_complete;
+ $Billing = $this->order->Billing;
+ $Paymethod = $this->order->paymethod();
+ $this->client = $this->getCurrentClient();
+
// client retrieved, now we are ready to process the payment
- if($client['id'] !== false && strlen($client['id']) > 0){
+ if($this->client->getId() !== false && strlen($this->client->getId()) > 0){
+ // load subscription class
+ //$this->subscriptions = new paymill_subscriptions('shopp');
+ //$this->offers = $this->subscriptions->offerGetList();
+
+ // get the totals for pre authorization
+ //$this->getTotals();
+
+ // create payment object and preauthorization
require_once(PAYMILL_DIR.'lib/integration/payment.inc.php');
-
- $paymentClass = new paymill_payment($client['id']);
-
- // calculate total based on product settings
- $total = (floatval($orderTotals->total)*100);
+ $this->paymentClass = new paymill_payment($this->client->getId(),$this->total_complete,$this->currency()); // create payment object, as it should be used for next processing instead of the token.
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ shopp_add_order_event($Purchase->id, 'auth-fail', array(
+ 'amount' => $orderTotals->total, // Amount to be authorized
+ 'gateway' => $Event->gateway, // Gateway handler name (module name from @subpackage)
+ 'message' => $GLOBALS['paymill_loader']->paymill_errors->getErrors(), 'paymill')
+ );
+ return false;
+ }
- $order_id = $Event->order;
-
- // make transaction (single time)
- if($total > 0){
- $transactionsObject = new Services_Paymill_Transactions($GLOBALS['paymill_settings']->paymill_general_settings['api_key_private'], $GLOBALS['paymill_settings']->paymill_general_settings['api_endpoint']);
-
- $ordermsg = __('Order', 'paymill').' #'.$order_id.' '.__('Forename', 'paymill').': '.strip_tags($order->Customer->firstname).' '.__('Surname', 'paymill').': '.strip_tags($order->Customer->lastname);
-
- $params = array(
- 'amount' => str_replace('.','',"$total"), // e.g. "4200" for 42.00 EUR
- 'currency' => $GLOBALS['paymill_settings']->paymill_general_settings['currency'], // ISO 4217
- 'payment' => $paymentClass->getPaymentID(),
- 'client' => $client['id'],
- 'description' => $ordermsg,
- 'source' => serialize($GLOBALS['paymill_source'])
- );
- $transaction = $transactionsObject->create($params);
-
- $response = $transactionsObject->getResponse();
- if(isset($response['body']['data']['response_code']) && $response['body']['data']['response_code'] != '20000'){
- shopp_add_order_event($Purchase->id, 'auth-fail', array(
- 'amount' => $orderTotals->total, // Amount to be authorized
- 'gateway' => $Event->gateway, // Gateway handler name (module name from @subpackage)
- 'message' => $response['body']['data']['response_code'], 'paymill')
- );
- }else{
- // save data to transaction table
- $query = 'INSERT INTO '.$wpdb->prefix.'paymill_transactions (paymill_transaction_id, paymill_payment_id, paymill_client_id, shopplugin_order_id, paymill_transaction_time) VALUES ("'.$transaction['id'].'", "'.$transaction['payment']['id'].'", "'.$transaction['client']['id'].'", "'.$order_id.'", "'.time().'")';
- $wpdb->query($query);
+ // process subscriptions & products
+ if($this->processSubscriptions() && $this->processProducts()){
+ // success
+ // the order_id usually comes from the auth or sale event object $Event->order
+ shopp_add_order_event( $Event->order, 'authed', array(
+ 'txnid' => $transaction['payment']['id'], // Transaction ID from payment gateway, in some cases will be in $Event->txnid
+ 'amount' => $orderTotals->total, // Gross amount authorized
+ 'gateway' => $Event->gateway, // Gateway handler name (module name from @subpackage)
+ 'paymethod' => $Paymethod->label, // Payment method (payment method label from your payment settings)
+ 'paytype' => $Billing->cardtype, // Type of payment (check, MasterCard, etc)
+ 'payid' => $Billing->card, // Payment ID (last 4 of card or check number)
+ ));
+
+ // either immediately after authed (in the case of a sale event)
+ // or in response to a capture order event
+ shopp_add_order_event( $Event->order, 'captured', array(
+ 'txnid' => $transaction['payment']['id'], // Transaction ID from payment gateway, in some cases will be in $Event->txnid
+ 'amount' => $orderTotals->total, // Gross amount captured
+ 'gateway' => $Event->gateway, // Gateway handler name (module name from @subpackage)
+ 'fees' => 0 // Transaction fee assessed by the payment gateway
+ ));
- // the order_id usually comes from the auth or sale event object $Event->order
- shopp_add_order_event( $Event->order, 'authed', array(
- 'txnid' => $transaction['payment']['id'], // Transaction ID from payment gateway, in some cases will be in $Event->txnid
- 'amount' => $orderTotals->total, // Gross amount authorized
- 'gateway' => $Event->gateway, // Gateway handler name (module name from @subpackage)
- 'paymethod' => $Paymethod->label, // Payment method (payment method label from your payment settings)
- 'paytype' => $Billing->cardtype, // Type of payment (check, MasterCard, etc)
- 'payid' => $Billing->card, // Payment ID (last 4 of card or check number)
- ));
-
- // either immediately after authed (in the case of a sale event)
- // or in response to a capture order event
- shopp_add_order_event( $Event->order, 'captured', array(
- 'txnid' => $transaction['payment']['id'], // Transaction ID from payment gateway, in some cases will be in $Event->txnid
- 'amount' => $orderTotals->total, // Gross amount captured
- 'gateway' => $Event->gateway, // Gateway handler name (module name from @subpackage)
- 'fees' => 0 // Transaction fee assessed by the payment gateway
- ));
-
- do_action('paymill_shopplugin_products_paid', array(
- 'total' => $total,
- 'currency' => $GLOBALS['paymill_settings']->paymill_general_settings['currency'],
- 'client' => $client['id']
- ));
+ do_action('paymill_shopplugin_products_paid', array(
+ 'total' => $total,
+ 'currency' => $this->currency(),
+ 'client' => $client['id']
+ ));
+ }else{
+ if($GLOBALS['paymill_loader']->paymill_errors->status()){
+ $GLOBALS['paymill_loader']->paymill_errors->getErrors();
}
+ return false;
}
+ }else{
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__('There was an issue with adding you as client for the payment process.', 'paymill'));
+ return false;
}
}
diff --git a/lib/integration/subscriptions.inc.php b/lib/integration/subscriptions.inc.php
index 608cc8b..2b7bbfa 100644
--- a/lib/integration/subscriptions.inc.php
+++ b/lib/integration/subscriptions.inc.php
@@ -2,57 +2,62 @@
class paymill_subscriptions{
- var $store = false;
- var $subscriptionsObject = false;
- var $cache = false;
+ private $store = false;
+ private $subscriptionsObject = false;
+ private $cache = false;
public function __construct($store){
- require_once(PAYMILL_DIR.'lib/api/Subscriptions.php');
- require_once(PAYMILL_DIR.'lib/api/Offers.php');
- require_once(PAYMILL_DIR.'lib/api/Preauthorizations.php');
-
- $this->subscriptionsObject = new Services_Paymill_Subscriptions($GLOBALS['paymill_settings']->paymill_general_settings['api_key_private'], $GLOBALS['paymill_settings']->paymill_general_settings['api_endpoint']);
- $this->offersObject = new Services_Paymill_Offers($GLOBALS['paymill_settings']->paymill_general_settings['api_key_private'], $GLOBALS['paymill_settings']->paymill_general_settings['api_endpoint']);
- $this->preAuthObject = new Services_Paymill_Preauthorizations($GLOBALS['paymill_settings']->paymill_general_settings['api_key_private'], $GLOBALS['paymill_settings']->paymill_general_settings['api_endpoint']);
-
$this->store = $store;
}
public function getList(){
- return $this->subscriptionsObject->get();
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_getList'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+
+ try{
+ $output = $request->getAll($GLOBALS['paymill_loader']->request_subscription);
+ }catch(Exception $e){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($e->getMessage(),'paymill'));
+ $output = false;
+ }
+
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_getList'); // benchmark
+ return $output;
}
public function details($sub_id){
- return $this->subscriptionsObject->getOne($sub_id);
- }
- public function create($client, $offer, $payment){
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_details'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
- // retrieve offer amount for preauthorization
- $offerDetail = $this->offerGetDetailByID($offer);
-
- // make preauth
- $params = array(
- 'payment' => $payment,
- 'amount' => $offerDetail[0]['amount'],
- 'currency' => $offerDetail[0]['currency']
- );
+ try{
+ $GLOBALS['paymill_loader']->request_subscription->setId($sub_id);
+ $output = $GLOBALS['paymill_loader']->request->getOne($GLOBALS['paymill_loader']->request_subscription);
+ }catch(Exception $e){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($e->getMessage(),'paymill'));
+ $output = false;
+ }
- $preAuthResponse = $this->preAuthObject->create($params);
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_details'); // benchmark
+ return $output;
+ }
+ public function create($client, $offer, $payment){
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_create'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
- if($preAuthResponse['preauthorization']['status'] == 'failed'){
- echo __($preAuthResponse['response_code'],'paymill');
- die();
- }else{
- $params = array(
- 'client' => $client,
- 'offer' => $offer,
- 'payment' => $payment
- );
+ try{
+ $GLOBALS['paymill_loader']->request_subscription->setClient($client);
+ $GLOBALS['paymill_loader']->request_subscription->setOffer($offer);
+ $GLOBALS['paymill_loader']->request_subscription->setPayment($payment);
- $subscription = $this->subscriptionsObject->create($params);
-
- return $subscription;
+ $subscription = $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_subscription);
+ $output = $subscription->getId();
+ }catch(Exception $e){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($e->getMessage(),'paymill'));
+ $output = false;
}
- }/*
+
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_create'); // benchmark
+ return $output;
+ }/* @todo
public function update(){
$params = array(
'id' => '',
@@ -62,60 +67,134 @@ public function update(){
);
$subscription = $this->subscriptionsObject->update($params);
}*/
- public function remove($subscriptionid){
- $this->subscriptionsObject->delete($subscriptionid);
+ public function remove($sub_id){
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_remove'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+
+ try{
+ $GLOBALS['paymill_loader']->request_subscription->setId($sub_id);
+
+ $response = $GLOBALS['paymill_loader']->request->delete($GLOBALS['paymill_loader']->request_subscription);
+ $output = $response;
+ }catch(Exception $e){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($e->getMessage(),'paymill'));
+ $output = false;
+ }
+
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_remove'); // benchmark
+ return $output;
}
public function offerGetList($reCache=false){
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_offerGetList'); // benchmark
global $wpdb;
-
- if($reCache === true){
- $offersList = $this->offersObject->get();
- foreach($offersList as $offer){
- $offersListSorted[$offer['id']] = $offer;
- }
- $query = "REPLACE INTO ".$wpdb->prefix."paymill_cache SET cache_id='subscription_plans',cache_content='".$wpdb->escape(serialize($offersListSorted))."'";
- $wpdb->query($query);
-
- $this->cache['subscription_plans'] = $offersListSorted;
+ try{
+ if($reCache === true){
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+ $wpdb->query('TRUNCATE TABLE '.$wpdb->prefix.'paymill_cache_offers');
+
+ $offersList = $GLOBALS['paymill_loader']->request->getAll($GLOBALS['paymill_loader']->request_offer);
- return $offersListSorted;
- }elseif(is_array($this->cache['subscription_plans'])){
- return $this->cache['subscription_plans'];
- }else{
- $query = 'SELECT * FROM '.$wpdb->prefix.'paymill_cache WHERE cache_id="subscription_plans"';
- $offersList = $wpdb->get_results($query,ARRAY_A);
-
- $offersList = unserialize($offersList[0]['cache_content']);
- $this->cache['subscription_plans'] = $offersList;
- return $offersList;
+ foreach($offersList as $offer){
+ $wpdb->insert(
+ $wpdb->prefix.'paymill_cache_offers',
+ array(
+ 'id' => $offer['id'],
+ 'name' => $offer['name'],
+ 'amount' => $offer['amount'],
+ 'currency' => $offer['currency'],
+ 'interval' => $offer['interval'],
+ 'trial_period_days' => $offer['trial_period_days']
+ ),
+ array(
+ '%s',
+ '%s',
+ '%d',
+ '%s',
+ '%s',
+ '%d'
+ )
+ );
+ $this->cache['subscription_plans'][$offer['id']] = $offer;
+ $this->cache['subscription_plans_by_name'][$offer['name']] = $offer;
+ }
+ }elseif(empty($this->cache['subscription_plans'])){
+ $query = 'SELECT * FROM '.$wpdb->prefix.'paymill_cache_offers';
+ $offersList = $wpdb->get_results($query,ARRAY_A);
+ foreach($offersList as $offer){
+ $this->cache['subscription_plans'][$offer['id']] = $offer;
+ $this->cache['subscription_plans_by_name'][$offer['name']] = $offer;
+ }
+ }else{
+ $output = false;
+ }
+ }catch(Exception $e){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($e->getMessage(),'paymill'));
+ $output = false;
}
+
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_offerGetList'); // benchmark
+ return $this->cache['subscription_plans'];
}
- /*
- public function offerGetDetail($reCache=false){
- if(!$reCache && isset($this->cache[$offer_id]) && is_array($this->cache[$offer_id])){
- return $this->cache[$offer_id];
+ public function offerGetDetailByID($id){
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_offerGetDetailByID'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+
+ if(isset($this->cache['subscription_plans'][$id]) && is_array($this->cache['subscription_plans'][$id]) && count($this->cache['subscription_plans'][$id]) > 0){
+ $output = $this->cache['subscription_plans'][$id];
}else{
- $this->offerGetList($reCache);
- return (isset($this->cache[$offer_id]) ? $this->cache[$offer_id] : false);
+ $this->offerGetList(true);
+ if(isset($this->cache['subscription_plans'][$id]) && is_array($this->cache['subscription_plans'][$id]) && count($this->cache['subscription_plans'][$id]) > 0){
+ $output = $this->cache['subscription_plans'][$id];
+ }else{
+ $output = false;
+ }
}
- }*/
- public function offerGetDetailByID($id){
- return $this->offersObject->get($id);
+
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_offerGetDetailByID'); // benchmark
+ return $output;
}
public function offerGetDetailByName($name){
- return $this->offersObject->get(array('name' => $name));
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_offerGetDetailByName'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+
+ if(isset($this->cache['subscription_plans_by_name'][$name]) && is_array($this->cache['subscription_plans_by_name'][$name]) && count($this->cache['subscription_plans_by_name'][$name]) > 0){
+ $output = $this->cache['subscription_plans_by_name'][$name];
+ }else{
+ $this->offerGetList(true);
+ if(isset($this->cache['subscription_plans_by_name'][$name]) && is_array($this->cache['subscription_plans_by_name'][$name]) && count($this->cache['subscription_plans_by_name'][$name]) > 0){
+ $output = $this->cache['subscription_plans_by_name'][$name];
+ }else{
+ $output = false;
+ }
+ }
+
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_offerGetDetailByName'); // benchmark
+ return $output;
}
public function offerCreate($params){
- /*$params = array(
- 'amount' => '4200', // E.g. "4200" for 42.00 EUR
- 'currency' => 'EUR', // ISO 4217
- 'interval' => '1 MONTH',
- 'name' => 'Test Offer'
- );*/
+ if(paymill_BENCHMARK)paymill_doBenchmark(true,'paymill_subscription_offerCreate'); // benchmark
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+
+ try{
+ $GLOBALS['paymill_loader']->request_offer->setAmount(round($params['amount']));
+ $GLOBALS['paymill_loader']->request_offer->setCurrency($params['currency']);
+ $GLOBALS['paymill_loader']->request_offer->setInterval($params['interval']);
+ $GLOBALS['paymill_loader']->request_offer->setName($params['name']);
+ $GLOBALS['paymill_loader']->request_offer->setTrialPeriodDays($params['trial_period_days']);
+
+ $output = $GLOBALS['paymill_loader']->request->create($GLOBALS['paymill_loader']->request_offer);
+ $offerID = $output->getId();
+ $this->offerGetList(true);
+ $output = $this->offerGetDetailByID($offerID);
+ }catch(Exception $e){
+ $GLOBALS['paymill_loader']->paymill_errors->setError(__($e->getMessage(),'paymill'));
+ $output = false;
+ }
- return $this->offersObject->create($params);
+ if(paymill_BENCHMARK)paymill_doBenchmark(false,'paymill_subscription_offerCreate'); // benchmark
+ return $output;
}
}
\ No newline at end of file
diff --git a/lib/integration/woocommerce.inc.php b/lib/integration/woocommerce.inc.php
index 0e45218..973e74b 100644
--- a/lib/integration/woocommerce.inc.php
+++ b/lib/integration/woocommerce.inc.php
@@ -1,76 +1,366 @@
'.$error.'';
+ }
+
+ $woocommerce->add_error($output);
+ }
}
- add_filter( 'woocommerce_payment_gateways', 'add_paymill_gateway_class' );
+ // HOOKED FUNCTIONS FROM PAYMILL WEBHOOKS
+ function paymill_webhooks(){
+ global $wpdb;
+
+ // is there a webhook from Paymill?
+ if(class_exists('WC_Subscriptions_Manager')){
+
+ // grab data from webhook
+ $body = @file_get_contents('php://input');
+ $event_json = json_decode($body, true);
+
+ // retrieve sub ID
+ if(isset($event_json['event']['event_resource']['id']) && strlen($event_json['event']['event_resource']['id']) > 0){
+ $paymill_sub_id = $event_json['event']['event_resource']['id'];
+ }elseif(isset($event_json['event']['event_resource']['subscription']['id']) && strlen($event_json['event']['event_resource']['subscription']['id']) > 0){
+ $paymill_sub_id = $event_json['event']['event_resource']['subscription']['id'];
+ }
+
+ error_log("\n\n########################################################################################################################\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+ error_log(date(DATE_RFC822).' - Webhook '.$event_json['event']['event_type'].' (Resource-ID: '.$paymill_sub_id.') triggered - start processing'."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+
+ /* output example:
+ array(1) {
+ ["event"]=>
+ array(4) {
+ ["event_type"]=>
+ string(20) "subscription.deleted"
+ ["event_resource"]=>
+ array(13) {
+ ["id"]=>
+ string(24) "sub_b71adbf5....."
+ ["offer"]=>
+ array(10) {
+ ["id"]=>
+ string(26) "offer_8083a5b....."
+ ["name"]=>
+ string(39) "woo_91_73da6....."
+ ["amount"]=>
+ int(100)
+ ["currency"]=>
+ string(3) "EUR"
+ ["interval"]=>
+ string(5) "1 DAY"
+ ["trial_period_days"]=>
+ int(0)
+ ["created_at"]=>
+ int(1389547028)
+ ["updated_at"]=>
+ int(1389547028)
+ ["subscription_count"]=>
+ array(2) {
+ ["active"]=>
+ string(1) "1"
+ ["inactive"]=>
+ string(1) "1"
+ }
+ ["app_id"]=>
+ NULL
+ }
+ ["livemode"]=>
+ bool(false)
+ ["cancel_at_period_end"]=>
+ bool(false)
+ ["trial_start"]=>
+ NULL
+ ["trial_end"]=>
+ NULL
+ ["next_capture_at"]=>
+ int(1389836717)
+ ["created_at"]=>
+ int(1389663382)
+ ["updated_at"]=>
+ int(1389750317)
+ ["canceled_at"]=>
+ NULL
+ ["app_id"]=>
+ NULL
+ ["payment"]=>
+ array(12) {
+ ["id"]=>
+ string(28) "pay_4e3759f....."
+ ["type"]=>
+ string(10) "creditcard"
+ ["client"]=>
+ string(27) "client_dbe164....."
+ ["card_type"]=>
+ string(4) "visa"
+ ["country"]=>
+ NULL
+ ["expire_month"]=>
+ string(2) "12"
+ ["expire_year"]=>
+ string(4) "2020"
+ ["card_holder"]=>
+ string(13) "dfgdfgdfgdfgd"
+ ["last4"]=>
+ string(4) "1111"
+ ["created_at"]=>
+ int(1389663369)
+ ["updated_at"]=>
+ int(1389663380)
+ ["app_id"]=>
+ NULL
+ }
+ ["client"]=>
+ array(8) {
+ ["id"]=>
+ string(27) "client_dbe164....."
+ ["email"]=>
+ string(22) "matthias@pc-intern.com"
+ ["description"]=>
+ string(15) "Matthias Reuter"
+ ["created_at"]=>
+ int(1389547027)
+ ["updated_at"]=>
+ int(1389547027)
+ ["app_id"]=>
+ NULL
+ ["payment"]=>
+ array(2) {
+ [0]=>
+ array(12) {
+ ["id"]=>
+ string(28) "pay_1a5ff8....."
+ ["type"]=>
+ string(10) "creditcard"
+ ["client"]=>
+ string(27) "client_dbe16....."
+ ["card_type"]=>
+ string(4) "visa"
+ ["country"]=>
+ NULL
+ ["expire_month"]=>
+ string(2) "12"
+ ["expire_year"]=>
+ string(4) "2020"
+ ["card_holder"]=>
+ string(10) "dfgdfgdfgd"
+ ["last4"]=>
+ string(4) "1111"
+ ["created_at"]=>
+ int(1389547027)
+ ["updated_at"]=>
+ int(1389547028)
+ ["app_id"]=>
+ NULL
+ }
+ [1]=>
+ array(12) {
+ ["id"]=>
+ string(28) "pay_4e375....."
+ ["type"]=>
+ string(10) "creditcard"
+ ["client"]=>
+ string(27) "client_dbe164....."
+ ["card_type"]=>
+ string(4) "visa"
+ ["country"]=>
+ NULL
+ ["expire_month"]=>
+ string(2) "12"
+ ["expire_year"]=>
+ string(4) "2020"
+ ["card_holder"]=>
+ string(13) "dfgdfgdfgdfgd"
+ ["last4"]=>
+ string(4) "1111"
+ ["created_at"]=>
+ int(1389663369)
+ ["updated_at"]=>
+ int(1389663380)
+ ["app_id"]=>
+ NULL
+ }
+ }
+ ["subscription"]=>
+ array(2) {
+ [0]=>
+ string(24) "sub_fcc4....."
+ [1]=>
+ string(24) "sub_b71a....."
+ }
+ }
+ }
+ ["created_at"]=>
+ int(1389816435)
+ ["app_id"]=>
+ NULL
+ }
+ }
+
+ */
+ //error_log(var_export($event_json,true)."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+
+ // get subscription info, if available
+ if(isset($paymill_sub_id) && strlen($paymill_sub_id) > 0){
+
+ $sql = $wpdb->prepare('SELECT * FROM '.$wpdb->prefix.'paymill_subscriptions WHERE paymill_sub_id=%s',
+ array(
+ $paymill_sub_id
+ ));
+
+ $sub_cache = $wpdb->get_results($sql,ARRAY_A);
+ $sub_cache = $sub_cache[0];
+
+ /* output example:
+ SELECT * FROM wp_paymill_subscriptions WHERE paymill_sub_id="sub_b71adbf5e097bbe5ba80"
+ */
+ error_log("\n\n".$sql."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+
+ /* output example:
+
+ 1
+
+ 30
+
+ */
+ //error_log($sub_cache['woo_user_id']."\n\n".$sub_cache['woo_offer_id']."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+
+ $subscription = WC_Subscriptions_Manager::get_subscription($sub_cache['woo_offer_id']);
+
+ // update subscriptions when webhook is triggered
+ if(isset($sub_cache['woo_offer_id']) && strlen($sub_cache['woo_offer_id']) > 0){
+ // subscription successfully created
+ if($event_json['event']['event_type'] == 'subscription.created'){
+
+ }
+ // tell WooCommerce when payment for subscription is successfully processed
+ if($event_json['event']['event_type'] == 'subscription.succeeded'){
+ /* example data WC_Subscriptions_Manager::get_subscription:
+ array(15) {
+ ["order_id"]=>
+ string(3) "201"
+ ["product_id"]=>
+ string(2) "91"
+ ["variation_id"]=>
+ string(0) ""
+ ["status"]=>
+ string(6) "active"
+ ["period"]=>
+ string(3) "day"
+ ["interval"]=>
+ string(1) "1"
+ ["length"]=>
+ string(2) "12"
+ ["start_date"]=>
+ string(19) "2014-01-12 17:17:10"
+ ["expiry_date"]=>
+ string(19) "2014-01-24 17:17:10"
+ ["end_date"]=>
+ string(1) "0"
+ ["trial_expiry_date"]=>
+ string(1) "0"
+ ["failed_payments"]=>
+ string(1) "0"
+ ["completed_payments"]=>
+ array(1) {
+ [0]=>
+ string(19) "2014-01-12 17:17:10"
+ }
+ ["suspension_count"]=>
+ string(1) "0"
+ ["last_payment_date"]=>
+ string(19) "2014-01-12 17:17:10"
+ }
+ */
+ error_log(var_export($subscription,true)."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+
+ if(count($subscription['completed_payments']) >= 1){
+ WC_Subscriptions_Manager::process_subscription_payments_on_order($subscription['order_id'], $subscription['product_id']);
+ }else{
+ WC_Subscriptions_Manager::activate_subscriptions_for_order($subscription['order_id']);
+ $order = new WC_Order($subscription['order_id']);
+ $order->payment_complete();
+ }
+ }
+ // cancel subscription, as it was deleted through Paymill dashboard
+ if($event_json['event']['event_type'] == 'subscription.deleted'){
+
+ $sql = $wpdb->prepare('DELETE FROM '.$wpdb->prefix.'paymill_subscriptions WHERE woo_user_id=%s AND woo_offer_id=%s',
+ array(
+ $sub_cache['woo_user_id'],
+ $sub_cache['woo_offer_id']
+ ));
+ $wpdb->query($sql);
+
+ error_log("\n\n".$sql."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+
+ //WC_Subscriptions_Manager::cancel_subscriptions_for_order( $order );
+ WC_Subscriptions_Manager::cancel_subscription($sub_cache['woo_user_id'], $sub_cache['woo_offer_id']);
+ }
+ // tell WC that payment failure occured
+ if($event_json['event']['event_type'] == 'subscription.failed'){
+ WC_Subscriptions_Manager::process_subscription_payment_failure_on_order($subscription['order_id'], $subscription['product_id']);
+ }
+ }
+ }
+ error_log(date(DATE_RFC822).' - Webhook '.$event_json['event']['event_type'].' finished - end processing'."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+ error_log("\n\n########################################################################################################################\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
+ }
+ }
+ add_action('woocommerce_api_wc_gateway_paymill_gateway', 'paymill_webhooks');
- add_action( 'cancelled_subscription_paymill','woo_cancelled_subscription_paymill', 10, 2 );
- // add_action( 'updated_users_subscriptions','woo_updated_subscription_paymill', 10, 2 );
+ add_action('cancelled_subscription_paymill','woo_cancelled_subscription_paymill', 10, 2);
+ //add_action( 'updated_users_subscriptions','woo_updated_subscription_paymill', 10, 2 );
//add_action( 'subscription_put_on-hold_paymill','woo_subscription_put_on_hold_paymill', 10, 2 );
//add_action( 'reactivated_subscription_paymill','woo_reactivated_subscription_paymill', 10, 2 );
-
function woo_cancelled_subscription_paymill($user,$subscription_key){
global $wpdb;
$userInfo = get_userdata(get_current_user_id());
- $subscriptions = new paymill_subscriptions('woocommerce');
- $query = 'SELECT paymill_sub_id FROM '.$wpdb->prefix.'paymill_subscriptions WHERE woo_user_id="'.$userInfo->ID.'" AND woo_offer_id="'.$user->id.'_'.$subscription_key.'"';
- $client_cache = $wpdb->get_results($query,ARRAY_A);
-
- $subscriptions->remove($client_cache[0]['paymill_sub_id']);
+ $client_cache = $wpdb->get_results($wpdb->prepare('SELECT paymill_sub_id FROM '.$wpdb->prefix.'paymill_subscriptions WHERE woo_user_id=%s AND woo_offer_id=%s',array($userInfo->ID,$user->id.'_'.$subscription_key)),ARRAY_A);
- $query = 'DELETE FROM '.$wpdb->prefix.'paymill_subscriptions WHERE woo_user_id="'.$userInfo->ID.'" AND woo_offer_id="'.$user->id.'_'.$subscription_key.'"';
- $wpdb->query($query);
+ $this->subscriptions->remove($client_cache[0]['paymill_sub_id']);
+ $wpdb->query($wpdb->prepare('DELETE FROM '.$wpdb->prefix.'paymill_subscriptions WHERE woo_user_id=%s AND woo_offer_id=%s',array($userInfo->ID,$user->id.'_'.$subscription_key)));
}
function woo_updated_subscription_paymill($user,$subscription_details){
- var_dump($user);
- var_dump($subscription_details);
- die();
+ // @todo: implement support for changing/creating offer later
}
-
function woo_subscription_put_on_hold_paymill(){
-
+ // currently not supported with Paymill
}
function woo_reactivated_subscription_paymill($user,$subscription_key){
-
+ // currently not supported with Paymill
}
-
- function init_paymill_gateway_class() {
+ function add_paymill_gateway_class($methods){
+ $methods[] = 'WC_Gateway_Paymill_Gateway';
+ return $methods;
+ }
+ add_filter('woocommerce_payment_gateways', 'add_paymill_gateway_class');
+ function init_paymill_gateway_class(){
global $wpdb;
-
- // update subscriptions when webhook is triggered
- if(class_exists('WC_Subscriptions_Manager') && isset($_GET['paymill_webhook']) && $_GET['paymill_webhook'] == 1){
- $body = @file_get_contents('php://input');
- $event_json = json_decode($body, true);
-
- if($event_json['event']['event_type'] == 'subscription.deleted'){
- $query = 'SELECT * FROM '.$wpdb->prefix.'paymill_subscriptions WHERE paymill_sub_id="'.$event_json['event']['event_resource']['id'].'"';
- $sub_cache = $wpdb->get_results($query,ARRAY_A);
-
- $query = 'DELETE FROM '.$wpdb->prefix.'paymill_subscriptions WHERE woo_user_id="'.$sub_cache[0]['woo_user_id'].'" AND woo_offer_id="'.$sub_cache[0]['woo_offer_id'].'"';
- $wpdb->query($query);
-
- //error_log("\n\n".$query."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
- //error_log($sub_cache[0]['woo_user_id']."\n\n".$sub_cache[0]['woo_offer_id']."\n\n", 3, PAYMILL_DIR.'lib/debug/PHP_errors.log');
-
- WC_Subscriptions_Manager::cancel_subscription($sub_cache[0]['woo_user_id'], $sub_cache[0]['woo_offer_id']);
- }
- }
-
+
if(class_exists('WC_Payment_Gateway')){
class WC_Gateway_Paymill_Gateway extends WC_Payment_Gateway{
+
+ private $total = 0;
+ private $total_complete = 0;
+ private $cart = false;
+ private $order_id = false;
+ private $order = false;
+ private $subscriptions = false;
+ private $offers = false;
+ private $order_desc = '';
+
public function __construct(){
-
+ load_paymill(); // this function-call can and should be used whenever working with Paymill API
+ $GLOBALS['paymill_loader']->paymill_errors->setFunction('paymill_woocommerce_errorHandling');
$GLOBALS['paymill_source']['woocommerce_version'] = ((isset($GLOBALS['woocommerce']) && is_object($GLOBALS['woocommerce']) && isset($GLOBALS['woocommerce']->version)) ? $GLOBALS['woocommerce']->version : 0);
$this->id = 'paymill';
@@ -99,12 +389,10 @@ public function __construct(){
'subscription_payment_method_change'*/
);
}
-
- // @todo: better icon
- function get_icon() {
+ public function get_icon() {
global $woocommerce;
- $icon = ''+getText+'
-
-
paymill_general_settings['payments_display']) && is_array($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) && count($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) > 0){
-?>
-
-
-paymill_general_settings['payments_display']) && is_array($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) && count($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) > 0){ + echo '
';
foreach($GLOBALS['paymill_settings']->paymill_general_settings['payments_display'] as $name => $type){
if($type==1){
- echo '.'/../img/logos/'.$name.'.png)
';
+ if(!isset($no_logos)){ echo ''; }
+ if($name == 'elv' || $name == 'sepa'){
+ $count_bank_payment_types++;
+ }
}
+ $count_all_payment_types++;
}
-?>
-
-
- ';
}
- ?>
-
- paymill_general_settings['payments_display']['elv']) == 1)
- && (count($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']) >= 2))
- ){
- ?>
-
-
- $count_bank_payment_types){
+ $show_cc = true;
+ echo '';
+ if(!isset($no_logos)){ echo ''; }
+ if($name == 'elv' || $name == 'sepa'){
+ $count_bank_payment_types++;
+ }
}
+ $count_all_payment_types++;
}
-?>
-
- '.__('Credit Card', 'paymill').'
';
+ }
+ // SEPA
+ if(isset($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']['sepa']) && $GLOBALS['paymill_settings']->paymill_general_settings['payments_display']['sepa'] == 1){
+ if(!isset($show_cc)){
+ $show_sepa = true;
+ }
+ echo ''.__('SEPA', 'paymill').'
';
+ }
+ // ELV
+ if(isset($GLOBALS['paymill_settings']->paymill_general_settings['payments_display']['elv']) && $GLOBALS['paymill_settings']->paymill_general_settings['payments_display']['elv'] == 1){
+ if(!isset($show_cc) && !isset($show_sepa)){
+ $show_sepa = true;
+ }
+ echo ''.__('ELV', 'paymill').'
';
}
?>
-
-
-
+
+
-