Skip to content

Commit d6d5a5e

Browse files
halink0803halink0803
authored
Merge pull request #58 from KyberNetwork/update-style
Update 0.1.1
2 parents c7480be + e160803 commit d6d5a5e

File tree

12 files changed

+158
-43
lines changed

12 files changed

+158
-43
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Kyber Payment Gateway for WooCommerce
2222

2323
# Requirements
2424

25-
- PHP version 5.6+
26-
- WordPress 3.8+
25+
- PHP version 7.2+
26+
- WordPress 4.0+
2727
- WooCommerce 3.0+
2828

2929
# Installation

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
],
2121
"minimum-stability": "dev",
2222
"require": {
23-
"kyber/monitor-kyber-tx": "v1.0.7"
23+
"kyber/monitor-kyber-tx": "v1.0.9"
2424
}
2525
}

‎composer.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎includes/class-woo-kyber-payment-gateway.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public function __construct() {
2424
$this->method_description = sprintf( __('Kyber allow user to pay by using tokens', 'woocommerce-gateway-kyber') );
2525
$this->order_button_text = __( 'Place order', 'woocommerce-gateway-kyber' );
2626
$this->has_fields = true;
27+
2728
$this->supports = array(
2829
'products',
2930
'refunds',
@@ -38,7 +39,12 @@ public function __construct() {
3839
$this->title = $this->get_option( 'title' );
3940
$this->enabled = $this->get_option( 'enabled' );
4041
$this->description = $this->get_option( 'description' );
42+
$this->network = $this->get_option( 'network' );
43+
$this->description = $this->get_option( 'description' );
4144

45+
if ( $this->network == "ropsten" ) {
46+
$this->description .= sprintf( __(" TESTMODE is enabled. The payment by this method now will not be proceed.", "woocommerce-gateway-kyber") );
47+
}
4248

4349
add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
4450
add_action( 'woocommerce_api_kyber_callback', array( $this, 'handle_kyber_callback' ) );
@@ -376,7 +382,7 @@ public function get_order_total_amount_by_token( $order ) {
376382
*/
377383
public function get_checkout_url( $order ) {
378384
// $version = $this->get_option( 'version' );
379-
$endpoint = "https://widget.kyber.network/v0.4/?type=pay&theme=light&paramForwarding=true&";
385+
$endpoint = "https://widget.kyber.network/v0.5/?type=pay&theme=light&paramForwarding=true&";
380386

381387

382388
$callback_url = get_site_url() . '/wc-api/kyber_callback';

‎public/class-woo-kyber-payment-public.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function enqueue_styles() {
7777
$version = $kyber_settings['version'];
7878
$version = $version ? $version : "v0.2";
7979
// wp_enqueue_style( "woo-kyber-pyment-widget-css", sprintf('https://widget.kyber.network/%s/widget.css', $version), array(), "0.0.2", 'all' );
80-
wp_enqueue_style( "woo-kyber-payment-widget-css", 'https://widget.kyber.network/v0.4/widget.css', array(), "", 'all' );
80+
wp_enqueue_style( "woo-kyber-payment-widget-css", 'https://widget.kyber.network/v0.5/widget.css', array(), "", 'all' );
8181

8282
}
8383

@@ -103,7 +103,7 @@ public function enqueue_scripts() {
103103
$version = $kyber_settings['version'];
104104
$version = $version ? $version : "v0.3";
105105
// wp_enqueue_script( "woo-kyber-payment-widget-js", sprintf('https://widget.kyber.network/%s/widget.js', $version), array(), $this->version, true);
106-
wp_enqueue_script( "woo-kyber-payment-widget-js", 'https://widget.kyber.network/v0.4/widget.js', array(), $this->version, true);
106+
wp_enqueue_script( "woo-kyber-payment-widget-js", 'https://widget.kyber.network/v0.5/widget.js', array(), $this->version, true);
107107
wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/woo-kyber-payment-public.js', array( 'jquery' ), "0.0.2", true);
108108
}
109109

‎public/css/woo-kyber-payment-public.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
src:url(text-security-disc.ttf)
1111
}
1212

13-
.kyber-icon {
14-
float: right;
15-
max-width: 40px;
13+
.woocommerce .kyber-icon {
14+
max-width: 25px;
1615
padding-left: 3px;
1716
margin: 0;
1817
}

‎vendor/composer/installed.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,24 +237,24 @@
237237
},
238238
{
239239
"name": "kyber/monitor-kyber-tx",
240-
"version": "v1.0.7",
241-
"version_normalized": "1.0.7.0",
240+
"version": "v1.0.9",
241+
"version_normalized": "1.0.9.0",
242242
"source": {
243243
"type": "git",
244244
"url": "https://github.com/KyberNetwork/widget-monitor-php.git",
245-
"reference": "fbcf0e65739109066519e7b6222ee71e54d11dd1"
245+
"reference": "89d007fe146c0dacf26177657839c3bf63ad31db"
246246
},
247247
"dist": {
248248
"type": "zip",
249-
"url": "https://api.github.com/repos/KyberNetwork/widget-monitor-php/zipball/fbcf0e65739109066519e7b6222ee71e54d11dd1",
250-
"reference": "fbcf0e65739109066519e7b6222ee71e54d11dd1",
249+
"url": "https://api.github.com/repos/KyberNetwork/widget-monitor-php/zipball/89d007fe146c0dacf26177657839c3bf63ad31db",
250+
"reference": "89d007fe146c0dacf26177657839c3bf63ad31db",
251251
"shasum": ""
252252
},
253253
"require": {
254-
"php": ">=5.3.0",
254+
"php": ">=7.1.0",
255255
"sc0vu/web3.php": "dev-master"
256256
},
257-
"time": "2018-12-10T08:25:08+00:00",
257+
"time": "2019-01-16T07:59:31+00:00",
258258
"type": "library",
259259
"installation-source": "dist",
260260
"autoload": {

‎vendor/kyber/monitor-kyber-tx/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ Currently, the following options are supported.
5353
| receivedToken | String | | Token your want to receive after transaction |
5454
| useIntervalLoop | Boolean | false | If you don't want to get response data until tx success |
5555
| useDatabase | Boolean | false | Set true if you want to use database to store tx, table with name "kyber_tx" would be created. And you should config server to run cronjob to update tx status (See example below) |
56-
| servername | String | | Database server name |
56+
| servername | String | | Database server name (only support MySql version in this version)|
5757
| username | String | | Database username |
5858
| password | String | | Database password |
59-
| db | String | | Database db |
59+
| db | String | | Database db name |
6060

6161
#### Response data
6262

‎vendor/kyber/monitor-kyber-tx/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"minimum-stability": "dev",
1313
"require": {
14-
"php": ">=5.3.0",
14+
"php": ">=7.1.0",
1515
"sc0vu/web3.php": "dev-master"
1616
},
1717
"autoload": {

‎vendor/kyber/monitor-kyber-tx/config/network/mainnet.json‎

Lines changed: 96 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,99 @@
494494
"icon": "dcc.svg",
495495
"isNew": true,
496496
"expireDate": "2018/11/05"
497+
},
498+
"CNN": {
499+
"name": "CNN Token",
500+
"symbol": "CNN",
501+
"decimals": 18,
502+
"address": "0x8713d26637CF49e1b6B4a7Ce57106AaBc9325343"
503+
},
504+
"SSP": {
505+
"name": "Smartshare Token",
506+
"symbol": "SSP",
507+
"decimals": 4,
508+
"address": "0x624d520BAB2E4aD83935Fa503fB130614374E850"
509+
},
510+
"PRO": {
511+
"name": "Propy",
512+
"symbol": "PRO",
513+
"decimals": 8,
514+
"address": "0x226bb599a12C826476e3A771454697EA52E9E220"
515+
},
516+
"OCN": {
517+
"name": "OCoin",
518+
"symbol": "OCN",
519+
"decimals": 18,
520+
"address": "0x4092678e4E78230F46A1534C0fbc8fA39780892B"
521+
},
522+
"EKO":{
523+
"name": "EchoLink",
524+
"symbol": "EKO",
525+
"address": "0xa6a840e50bcaa50da017b91a0d86b8b2d41156ee",
526+
"decimals": 18
527+
},
528+
"HOT": {
529+
"name": "Hydro Protocol",
530+
"symbol": "HOT",
531+
"address": "0x9af839687f6c94542ac5ece2e317daae355493a1",
532+
"decimals": 18
533+
},
534+
"OST": {
535+
"name": "Open Simple Token",
536+
"symbol": "OST",
537+
"address": "0x2c4e8f2d746113d0696ce89b35f0d8bf88e0aeca",
538+
"decimals": 18
539+
},
540+
"DTH":{
541+
"name": "Dether",
542+
"symbol" : "DTH",
543+
"decimals": 18,
544+
"address": "0x5adc961D6AC3f7062D2eA45FEFB8D8167d44b190",
545+
"hidden": 1542891600000
546+
},
547+
"TVND":{
548+
"name": "TrueVND",
549+
"symbol" : "TVND",
550+
"decimals": 18,
551+
"address": "0x3Dc0501c32beE0cc1e629d590302A4b909797474",
552+
"hidden": true
553+
},
554+
"WBTC":{
555+
"name": "Wrapped BTC",
556+
"symbol" : "WBTC",
557+
"decimals": 8,
558+
"address": "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
559+
"hidden": true
560+
},
561+
562+
"ABYSS":{
563+
"name": "ABYSS",
564+
"symbol" : "ABYSS",
565+
"decimals": 18,
566+
"address": "0x0E8d6b471e332F140e7d9dbB99E5E3822F728DA6",
567+
"hidden": true
568+
},
569+
"PT":{
570+
"name": "Promotion Token",
571+
"symbol" : "PT",
572+
"decimals": 18,
573+
"address": "0x094c875704c14783049ddf8136e298b3a099c446",
574+
"hidden": 1543938161000
575+
},
576+
577+
"TTC":{
578+
"name": "TTC Protocol",
579+
"symbol" : "TTC",
580+
"decimals": 18,
581+
"address": "0x9389434852b94bbad4c8afed5b7bdbc5ff0c2275",
582+
"hidden": 1546088400000
583+
},
584+
"INF":{
585+
"name": "InfinitusTokens",
586+
"symbol" : "INF",
587+
"decimals": 18,
588+
"address": "0x00e150d741eda1d49d341189cae4c08a73a49c95",
589+
"hidden": 1545048000000
497590
}
498591
},
499592
"ethScanUrl": "https://etherscan.io/",
@@ -502,7 +595,9 @@
502595
"network": "0x818e6fecd516ecc3849daf6845e3ec868087b755",
503596
"wrapper": "0x6172afc8c00c46e0d07ce3af203828198194620a",
504597
"payWrapper": "0xFa71B63935cF9878E009ba6595Da08f6d75C4Aa1",
505-
"trade_topic":"0x1c8399ecc5c956b9cb18c820248b10b634cca4af308755e07cd467655e8ec3c7",
598+
"trade_topic_1": "0x1c8399ecc5c956b9cb18c820248b10b634cca4af308755e07cd467655e8ec3c7",
599+
"changedKyberTradeBlock": 7024980,
600+
"trade_topic_2":"0xd30ca399cb43507ecec6a629a35cf45eb98cda550c27696dcb0d8c4a3873ce6c",
506601
"endpoint": "wss://mainnet.infura.io/ws",
507602
"averageBlockTime": 15000,
508603
"networkId": 1,

0 commit comments

Comments
 (0)