Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solve conflicts

This commit is contained in:
Ninos Ego 2014-09-02 21:23:50 +02:00
parent 0f6b4cae5f
commit 4d4a24986b
4 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i18n/languages/woocommerce-admin.pot
View File

@ -4,11 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 2.2.0-bleeding Admin\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-08-21 16:05:27+00:00\n"
=======
"POT-Creation-Date: 2014-08-29 19:08:53+00:00\n"
>>>>>>> upstream/master
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"

28
i18n/languages/woocommerce.pot
View File

@ -4,11 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 2.2.0-bleeding Frontend\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-08-21 16:05:26+00:00\n"
=======
"POT-Creation-Date: 2014-08-29 19:08:30+00:00\n"
>>>>>>> upstream/master
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -4066,11 +4062,7 @@ msgstr ""
#: includes/gateways/bacs/class-wc-gateway-bacs.php:66
#: includes/gateways/cheque/class-wc-gateway-cheque.php:52
#: includes/gateways/mijireh/class-wc-gateway-mijireh.php:124
<<<<<<< HEAD
#: includes/gateways/paypal/class-wc-gateway-paypal.php:121
=======
#: includes/gateways/paypal/class-wc-gateway-paypal.php:120
>>>>>>> upstream/master
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:170
#: includes/shipping/flat-rate/class-wc-shipping-flat-rate.php:75
#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:64
@ -4268,11 +4260,7 @@ msgstr ""
msgid "Order item stock reduced successfully."
msgstr ""
<<<<<<< HEAD
#: includes/abstracts/abstract-wc-payment-gateway.php:275
=======
#: includes/abstracts/abstract-wc-payment-gateway.php:279
>>>>>>> upstream/master
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:259
msgid "Card Number"
msgstr ""
@ -6180,11 +6168,7 @@ msgstr ""
#: includes/gateways/cheque/class-wc-gateway-cheque.php:58
#: includes/gateways/cod/class-wc-gateway-cod.php:66
#: includes/gateways/mijireh/class-wc-gateway-mijireh.php:137
<<<<<<< HEAD
#: includes/gateways/paypal/class-wc-gateway-paypal.php:127
=======
#: includes/gateways/paypal/class-wc-gateway-paypal.php:126
>>>>>>> upstream/master
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:177
#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:103
#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:81
@ -6205,11 +6189,7 @@ msgstr ""
#: includes/gateways/bacs/class-wc-gateway-bacs.php:74
#: includes/gateways/cheque/class-wc-gateway-cheque.php:60
#: includes/gateways/mijireh/class-wc-gateway-mijireh.php:139
<<<<<<< HEAD
#: includes/gateways/paypal/class-wc-gateway-paypal.php:129
=======
#: includes/gateways/paypal/class-wc-gateway-paypal.php:128
>>>>>>> upstream/master
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:179
#: includes/shipping/flat-rate/class-wc-shipping-flat-rate.php:83
#: includes/shipping/free-shipping/class-wc-shipping-free-shipping.php:72
@ -6227,11 +6207,7 @@ msgstr ""
#: includes/gateways/cheque/class-wc-gateway-cheque.php:65
#: includes/gateways/cod/class-wc-gateway-cod.php:73
#: includes/gateways/mijireh/class-wc-gateway-mijireh.php:144
<<<<<<< HEAD
#: includes/gateways/paypal/class-wc-gateway-paypal.php:134
=======
#: includes/gateways/paypal/class-wc-gateway-paypal.php:133
>>>>>>> upstream/master
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:184
#: includes/wc-template-functions.php:1004
msgid "Description"
@ -6427,11 +6403,7 @@ msgid "Pay securely with your credit card."
msgstr ""
#: includes/gateways/mijireh/class-wc-gateway-mijireh.php:147
<<<<<<< HEAD
#: includes/gateways/paypal/class-wc-gateway-paypal.php:137
=======
#: includes/gateways/paypal/class-wc-gateway-paypal.php:136
>>>>>>> upstream/master
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:186
msgid "This controls the description which the user sees during checkout."
msgstr ""

4
includes/api/class-wc-api-orders.php
View File

@ -208,11 +208,7 @@ class WC_API_Orders extends WC_API_Resource {
$item_meta = array();
<<<<<<< HEAD
$hideprefix = $filter['all_meta'] == 'true' ? null : '_';
=======
$hideprefix = ( isset( $filter['all_item_meta'] ) && $filter['all_item_meta'] === 'true' ) ? null : '_';
>>>>>>> upstream/master
foreach ( $meta->get_formatted( $hideprefix ) as $meta_key => $formatted_meta ) {
$item_meta[] = array(

19
includes/gateways/paypal/class-wc-gateway-paypal.php
View File

@ -1045,24 +1045,6 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
/**
* Get the transaction URL.
*
<<<<<<< HEAD
* @param string $transaction_id
*
* @return string
*/
public function get_transaction_url( $transaction_id ) {
$return_url = '';
if ( empty( $transaction_id ) ) {
if ( 'yes' == $this->testmode ) {
$return_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%s';
} else {
$return_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%s';
}
}
return apply_filters( 'woocommerce_get_transaction_url', $return_url, $transaction_id, $this );
=======
* @param WC_Order $order
*
* @return string
@ -1076,6 +1058,5 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
}
return parent::get_transaction_url( $order );
>>>>>>> upstream/master
}
}