Skip to content

Commit d8a35d7

Browse files
ahuininga-orishaahuininga-orisha
authored
Merge pull request #157 from EmicoEcommerce/develop
Merge develop into beta
2 parents 7b4dacf + d41cb6c commit d8a35d7

4 files changed

Lines changed: 106 additions & 5 deletions

File tree

‎src/Api/Data/LandingPageInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function setFilterAttributes(?string $filterAttributes): LandingPageInter
167167
public function getFilters(): array;
168168

169169
/**
170-
* @return array
170+
* @return string[]
171171
*/
172172
public function getUnserializedFilterAttributes(): array;
173173

‎src/Model/LandingPage.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,9 @@ public function getLandingPageDataWithoutStore(): array
611611
LandingPageInterface::OVERVIEW_PAGE_ID,
612612
LandingPageInterface::OVERVIEW_PAGE_IMAGE,
613613
LandingPageInterface::URL_PATH,
614-
LandingPageInterface::STORE_ID,
615614
];
616615

617-
if ($this->getData(LandingPageInterface::STORE_ID) === 0) {
616+
if ((int) $this->getData(LandingPageInterface::STORE_ID) === 0) {
618617
$fields[] = LandingPageInterface::NAME;
619618
}
620619

‎src/etc/db_schema_whitelist.json‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{
2+
"emico_attributelanding_page": {
3+
"column": {
4+
"page_id": true,
5+
"created_at": true,
6+
"updated_at": true,
7+
"url_path": true,
8+
"overview_page_id": true,
9+
"name": true,
10+
"overview_page_image": true
11+
},
12+
"index": {
13+
"EMICO_ATTRIBUTELANDING_PAGE_URL_PATH": true
14+
},
15+
"constraint": {
16+
"PRIMARY": true,
17+
"FK_A8661B1DD183E5D311907AF672A5EBB6": true
18+
}
19+
},
20+
"emico_attributelanding_page_store": {
21+
"column": {
22+
"id": true,
23+
"page_id": true,
24+
"store_id": true,
25+
"active": true,
26+
"name": true,
27+
"url_path": true,
28+
"category_id": true,
29+
"heading": true,
30+
"header_image": true,
31+
"meta_title": true,
32+
"meta_keywords": true,
33+
"meta_description": true,
34+
"content_first": true,
35+
"content_last": true,
36+
"filter_attributes": true,
37+
"tweakwise_filter_template": true,
38+
"is_filter_link_allowed": true,
39+
"canonical_url": true,
40+
"hide_selected_filters": true,
41+
"tweakwise_sort_template": true,
42+
"tweakwise_builder_template": true
43+
},
44+
"index": {
45+
"EMICO_ATTRIBUTELANDING_PAGE_STORE_URL_PATH": true
46+
},
47+
"constraint": {
48+
"PRIMARY": true,
49+
"EMICO_ATTRIBUTELANDING_PAGE_STORE_PAGE_ID_STORE_ID": true,
50+
"FK_3277887D3FFBCA6335B0722410074EC8": true,
51+
"EMICO_ATTRIBUTELANDING_PAGE_STORE_STORE_ID_STORE_STORE_ID": true
52+
}
53+
},
54+
"emico_attributelanding_overviewpage": {
55+
"column": {
56+
"page_id": true,
57+
"active": true,
58+
"created_at": true,
59+
"updated_at": true,
60+
"url_path": true,
61+
"heading": true,
62+
"meta_title": true,
63+
"meta_keywords": true,
64+
"meta_description": true,
65+
"content_first": true,
66+
"content_last": true,
67+
"store_ids": true,
68+
"name": true
69+
},
70+
"index": {
71+
"EMICO_ATTRIBUTELANDING_OVERVIEWPAGE_URL_PATH": true
72+
},
73+
"constraint": {
74+
"PRIMARY": true
75+
}
76+
},
77+
"emico_attributelanding_overviewpage_store": {
78+
"column": {
79+
"id": true,
80+
"page_id": true,
81+
"store_id": true,
82+
"name": true,
83+
"active": true,
84+
"url_path": true,
85+
"heading": true,
86+
"meta_title": true,
87+
"meta_keywords": true,
88+
"meta_description": true,
89+
"content_first": true,
90+
"content_last": true
91+
},
92+
"index": {
93+
"EMICO_ATTRIBUTELANDING_OVERVIEWPAGE_STORE_URL_PATH": true
94+
},
95+
"constraint": {
96+
"PRIMARY": true,
97+
"EMICO_ATTRIBUTELANDING_OVERVIEWPAGE_STORE_PAGE_ID_STORE_ID": true,
98+
"FK_B7EFA6127C42BC761B70AF51B95F160D": true,
99+
"EMICO_ATTRLANDING_OVERVIEWPAGE_STORE_STORE_ID_STORE_STORE_ID": true
100+
}
101+
}
102+
}

‎src/etc/webapi.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<resource ref="Emico_AttributeLanding::Page_view"/>
1313
</resources>
1414
</route>
15-
<route method="GET" url="/V1/emico-attributelanding/page/:pageId">
16-
<service class="Emico\AttributeLanding\Api\LandingPageRepositoryInterface" method="getById"/>
15+
<route method="GET" url="/V1/emico-attributelanding/page/:pageId/:storeId">
16+
<service class="Emico\AttributeLanding\Api\LandingPageRepositoryInterface" method="getByIdWithStore"/>
1717
<resources>
1818
<resource ref="Emico_AttributeLanding::Page_view"/>
1919
</resources>

0 commit comments

Comments
 (0)