senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Almira Krdzic
2018-10-20 00:08:48 +02:00
parent 52fb6dc5d9
commit 4d87551fef
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
View File

@@ -73,7 +73,7 @@ class Wiaas_REST_Customer_API {
$customer_shops = array_map(function($customer_shop) { $customer_shops = array_map(function($customer_shop) {
return array( return array(
'id' => $customer_shop['owner_id'], 'id' => absint($customer_shop['owner_id']),
'type' => $customer_shop['order_type'], 'type' => $customer_shop['order_type'],
'name' => wiaas_get_organization_name($customer_shop['owner_id']) 'name' => wiaas_get_organization_name($customer_shop['owner_id'])
); );

1
frontend/src/actions/coMarket/coMarketPackagesActions.js
View File

@@ -74,7 +74,6 @@ export const fetchShops = (userId) => {
if (shopOptions.length) { if (shopOptions.length) {
dispatch(selectShop(shopOptions[0])); dispatch(selectShop(shopOptions[0]));
dispatch(fetchShopPackages(shopOptions[0]));
} }
} }
}) })

9
frontend/src/containers/coMarket/CoMarketPackagesContainer.jsx
View File

@@ -8,7 +8,7 @@ import {
import ShopItem from './components/ShopItem.jsx'; import ShopItem from './components/ShopItem.jsx';
import WiaasBox from '../../mainComponents/box/WiaasBox.jsx'; import WiaasBox from '../../mainComponents/box/WiaasBox.jsx';
import CoMarketNavContainer from './CoMarketNavContainer.jsx'; import CoMarketNavContainer from './CoMarketNavContainer.jsx';
import {fetchShopPackages} from '../../actions/coMarket/coMarketPackagesActions'; import {fetchShopPackages, selectShop} from '../../actions/coMarket/coMarketPackagesActions';
class CoMarketPackagesContainer extends Component { class CoMarketPackagesContainer extends Component {
componentDidMount() { componentDidMount() {
@@ -17,6 +17,13 @@ class CoMarketPackagesContainer extends Component {
} }
} }
componentWillReceiveProps(nextProps){
if (nextProps.selectedShop &&
(!this.props.selectedShop || this.props.selectedShop.id !== nextProps.selectedShop.id)) {
this.props.dispatch(fetchShopPackages(nextProps.selectedShop));
}
}
render() { render() {
const {shopPackages, selectedShop, isLoading} = this.props; const {shopPackages, selectedShop, isLoading} = this.props;

8
frontend/src/containers/coMarket/components/CoMarketCatalogSelect.jsx
View File

@@ -25,10 +25,10 @@ class CoMarketCatalogSelect extends Component {
} }
componentWillReceiveProps(nextProps){ componentWillReceiveProps(nextProps){
// if(nextProps.activeModule==='cart' && nextProps.shops && nextProps.cartItems && nextProps.cartItems.length > 0){ if(nextProps.activeModule==='cart' && nextProps.shops && nextProps.cartItems && nextProps.cartItems.length > 0){
// const cartShop = this.props.shops.find( shop => { return shop.id === this.props.cartItems[0].idCommercialLead }); const cartShop = nextProps.shops.find( shop => { return shop.id === nextProps.cartItems[0].idCommercialLead });
// nextProps.dispatch(selectShop(cartShop)); nextProps.dispatch(selectShop(cartShop));
// } }
if(nextProps.shops && nextProps.idCommercialLead && nextProps.activeModule === 'co-market'){ if(nextProps.shops && nextProps.idCommercialLead && nextProps.activeModule === 'co-market'){
const shop = nextProps.shops.find( shop => {return shop.id === nextProps.idCommercialLead }); const shop = nextProps.shops.find( shop => {return shop.id === nextProps.idCommercialLead });