Skip to content
Snippets Groups Projects
Commit 9fe1cf58 authored by Grzegorz Rola's avatar Grzegorz Rola
Browse files

Init

parent 59c46913
No related branches found
No related tags found
1 merge request!1Init
Pipeline #2479 failed
import React, { Component } from 'react'; import React, { Component } from 'react';
import BoxRow from "./box-row.jsx"; import BoxRow from "./box-row.jsx";
export default class BoxesTable extends React.Component { export default class SenderAddressTable extends React.Component {
constructor (props) { constructor (props) {
super(props); super(props);
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import BoxesTable from "./boxes-table.jsx"; import SenderAddressTable from "./sender-address-table.jsx";
export default class ShippingBoxes extends React.Component { export default class SenderAddress extends React.Component {
constructor (props) { constructor (props) {
super(props); super(props);
this.state = { this.state = {
...@@ -15,9 +15,8 @@ export default class ShippingBoxes extends React.Component { ...@@ -15,9 +15,8 @@ export default class ShippingBoxes extends React.Component {
render () { render () {
return ( return (
<div> <div>
<BoxesTable <SenderAddressTable
boxes={this.state.boxes} boxes={this.state.boxes}
builtInBoxes={this.state.builtInBoxes}
name={this.state.name} name={this.state.name}
labels={this.state.labels} labels={this.state.labels}
/> />
......
...@@ -61,7 +61,7 @@ class SettingsField { ...@@ -61,7 +61,7 @@ class SettingsField {
) { ) {
$field_key = $this->field_name; $field_key = $this->field_name;
$settings_field_value_as_array = json_decode( $settings_field_value_as_json, true ); $settings_field_value_as_array = json_decode( ! empty( $settings_field_value_as_json ) ? $settings_field_value_as_json: '{}', true );
if ( empty( $settings_field_value_as_array ) || $settings_field_value_as_array === false ) { if ( empty( $settings_field_value_as_array ) || $settings_field_value_as_array === false ) {
$settings_field_value_as_array = array(); $settings_field_value_as_array = array();
...@@ -72,7 +72,6 @@ class SettingsField { ...@@ -72,7 +72,6 @@ class SettingsField {
} }
$json_value = json_encode( array_values( $settings_field_value_as_array ) ); $json_value = json_encode( array_values( $settings_field_value_as_array ) );
include __DIR__ . '/views/settings-field.php'; include __DIR__ . '/views/settings-field.php';
} }
......
...@@ -17,10 +17,14 @@ trait ShippingMethodRenderSettingsTrait { ...@@ -17,10 +17,14 @@ trait ShippingMethodRenderSettingsTrait {
* *
* @param string $key . * @param string $key .
* @param array $data . * @param array $data .
*
* @return string
*/ */
public function generate_sender_address_html( $key, $data ) { public function generate_sender_address_html( $key, $data ) {
$settings_field = new SettingsField( $key ); $settings_field = new SettingsField( $key );
$settings_field->render( $data['title'], '', $data['value'], null ); ob_start();
$settings_field->render( $data['title'], '', isset( $data['value'] ) ? $data['value'] : '', null );
return ob_get_clean();
} }
} }
\ No newline at end of file
...@@ -7,6 +7,6 @@ document.addEventListener('DOMContentLoaded', function () { ...@@ -7,6 +7,6 @@ document.addEventListener('DOMContentLoaded', function () {
let i; let i;
for (i = 0; i < elements.length; i++) { for (i = 0; i < elements.length; i++) {
let element = elements[i]; let element = elements[i];
ReactDOM.render(<ShippingBoxes boxes={element.dataset.value} name={element.dataset.name} builtinboxes={element.dataset.builtinboxes} labels={element.dataset.labels}/>, document.getElementById(element.id)); ReactDOM.render(<SenderAddress addresses={element.dataset.value} name={element.dataset.name} labels={element.dataset.labels}/>, document.getElementById(element.id));
} }
}); });
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
</th> </th>
<td class="forminp"> <td class="forminp">
<fieldset <fieldset
class="settings-field-boxes" class="settings-field-sender-address"
id="<?php echo esc_attr( $field_key ); ?>_fieldset" id="<?php echo esc_attr( $field_key ); ?>_fieldset"
data-value="<?php echo esc_attr( $json_value ); ?>" data-value="<?php echo esc_attr( $json_value ); ?>"
data-name="<?php echo esc_attr( $field_key ); ?>" data-name="<?php echo esc_attr( $field_key ); ?>"
data-builtinboxes="<?php echo esc_attr( json_encode( array_values( $built_in_boxes ) ) ); ?>"
data-labels="<?php echo esc_attr( json_encode( $labels, JSON_FORCE_OBJECT ) ); ?>" data-labels="<?php echo esc_attr( json_encode( $labels, JSON_FORCE_OBJECT ) ); ?>"
> >
</fieldset> </fieldset>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment