Skip to content

Commit 0b8a137

Browse files
alexandrdrvnalexandrdrvn
committed
Fix bugs
1 parent b1f6096 commit 0b8a137

File tree

16 files changed

+17818
-535
lines changed

16 files changed

+17818
-535
lines changed

‎Vuefront/Vuefront/ApiGraphql/cached_schema.php‎

Lines changed: 17424 additions & 0 deletions
Large diffs are not rendered by default.

‎Vuefront/Vuefront/ApiGraphql/model/blog/category.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function getCategories($data = array())
6363
if (isset($data['sort']) && in_array($data['sort'], array_keys($sort_data))) {
6464
$sort = $sort_data[$data['sort']];
6565
} else {
66-
$sort = "category_id";
66+
$sort = "position";
6767
}
6868

6969
$collection->setOrder($sort, $order);

‎Vuefront/Vuefront/ApiGraphql/model/blog/post.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getPosts($data)
5151
if (isset($data['sort']) && in_array($data['sort'], array_keys($sort_data))) {
5252
$sort = $sort_data[$data['sort']];
5353
} else {
54-
$sort = "post_id";
54+
$sort = "position";
5555
}
5656

5757
$collection->setOrder($sort, $order);

‎Vuefront/Vuefront/ApiGraphql/model/common/address.php‎

Lines changed: 47 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,68 @@
11
<?php
22

3-
require_once VF_SYSTEM_DIR.'engine/model.php';
3+
use Magento\Framework\App\ObjectManager;
44

5+
require_once VF_SYSTEM_DIR . 'engine/model.php';
6+
7+
/**
8+
* @property \Magento\Customer\Model\AddressFactory $_addressFactory
9+
*/
510
class ModelCommonAddress extends Model
611
{
7-
public function addAddress($customer_id, $data)
8-
{
9-
$region_info = $this->load->resolver('common/zone/get', array(
10-
'id' => $data['zoneId']
11-
));
12-
13-
$region = !empty($region_info) ? $region_info['name'] : '';
14-
15-
$sql = "INSERT INTO `".$this->db->getTableName('customer_address_entity')."` SET
16-
parent_id = '".$customer_id."',
17-
city = '".$data['city']."',
18-
company = '".$data['company']."',
19-
country_id = '".$data['countryId']."',
20-
firstname = '".$data['firstName']."',
21-
lastname = '".$data['lastName']."',
22-
postcode = '".$data['zipcode']."',
23-
region = '".$region."',
24-
region_id = '".$data['zoneId']."',
25-
street = '".$data['address1'].' '.$data['address2']."'";
12+
private $_addressFactory;
2613

27-
$this->db->query($sql);
14+
public function __construct($registry)
15+
{
16+
parent::__construct($registry);
2817

29-
return $this->db->getLastId();
18+
$objectManager = ObjectManager::getInstance();
19+
$this->_addressFactory = $objectManager->get('\Magento\Customer\Model\AddressFactory');
3020
}
3121

32-
public function editAddress($address_id, $data)
22+
public function addAddress($customer, $data)
3323
{
34-
$region_info = $this->load->resolver('common/zone/get', array(
35-
'id' => $data['zoneId']
36-
));
37-
38-
$region = !empty($region_info) ? $region_info['name'] : '';
39-
40-
$sql = "UPDATE `".$this->db->getTableName('customer_address_entity')."` SET
41-
city = '".$data['city']."',
42-
company = '".$data['company']."',
43-
country_id = '".$data['countryId']."',
44-
firstname = '".$data['firstName']."',
45-
lastname = '".$data['lastName']."',
46-
postcode = '".$data['zipcode']."',
47-
region = '".$region."',
48-
region_id = '".$data['zoneId']."',
49-
street = '".$data['address1'].' '.$data['address2']."'
50-
where entity_id = '".$address_id."'";
51-
52-
$this->db->query($sql);
24+
$address = $this->_addressFactory->create();
25+
$address->setCity($data['city']);
26+
$address->setCompany($data['company']);
27+
$address->setFirstname($data['firstName']);
28+
$address->setLastname($data['lastName']);
29+
$address->setPostcode($data['zipcode']);
30+
$address->setRegionId($data['zoneId']);
31+
$address->setCountryId($data['countryId']);
32+
$address->setStreet($data['address1'] . ' ' . $data['address2']);
33+
$address->setTelephone(' ');
34+
$address->setCustomer($customer);
35+
$address->save();
36+
37+
return $address;
5338
}
5439

55-
public function getAddress($address_id)
40+
public function editAddress($address_id, $data)
5641
{
57-
$sql = "SELECT entity_id as address_id,city, company, country_id, firstname, lastname,postcode, region_id, street
58-
FROM `".$this->db->getTableName('customer_address_entity')."`
59-
where entity_id = '".$address_id."'";
60-
61-
$results = $this->db->fetchOne($sql);
62-
63-
return $results;
42+
$address = $this->_addressFactory->create()->load($address_id);
43+
44+
$address->setCity($data['city']);
45+
$address->setCompany($data['company']);
46+
$address->setFirstname($data['firstName']);
47+
$address->setLastname($data['lastName']);
48+
$address->setPostcode($data['zipcode']);
49+
$address->setRegionId($data['zoneId']);
50+
$address->setCountryId($data['countryId']);
51+
$address->setStreet($data['address1'] . ' ' . $data['address2']);
52+
$address->setTelephone(' ');
53+
$address->save();
54+
55+
return $address;
6456
}
6557

66-
public function getAddresses($customer_id, $data = array())
58+
public function deleteAddress($address_id)
6759
{
68-
$sql = "SELECT entity_id as address_id,city, company, country_id, firstname, lastname,postcode, region_id, street
69-
FROM `".$this->db->getTableName('customer_address_entity')."` where parent_id = '".$customer_id."'";
70-
71-
$sort_data = array(
72-
'entity_id',
73-
'street'
74-
);
75-
76-
if (isset($data['sort']) && in_array($data['sort'], $sort_data)) {
77-
$sql .= " ORDER BY " . $data['sort'];
78-
} else {
79-
$sql .= " ORDER BY entity_id";
80-
}
81-
82-
if (isset($data['order']) && ($data['order'] == 'DESC')) {
83-
$sql .= " DESC";
84-
} else {
85-
$sql .= " ASC";
86-
}
87-
88-
if (isset($data['start']) || isset($data['limit'])) {
89-
if ($data['start'] < 0) {
90-
$data['start'] = 0;
91-
}
92-
93-
if ($data['limit'] < 1) {
94-
$data['limit'] = 20;
95-
}
96-
97-
$sql .= " LIMIT " . (int) $data['start'] . "," . (int) $data['limit'];
98-
}
99-
100-
$results = $this->db->fetchAll($sql);
101-
102-
return $results;
60+
$this->_addressFactory->create()->load($address_id)->delete();
10361
}
10462

105-
public function getTotalAddresses($customer_id, $data)
63+
public function getAddress($address_id)
10664
{
107-
$sql = "SELECT count(*) as total
108-
FROM `".$this->db->getTableName('customer_address_entity')."` where parent_id = '".$customer_id."'";
109-
110-
$results = $this->db->fetchOne($sql);
111-
112-
return $results['total'];
65+
return $this->_addressFactory->create()->load($address_id);
11366
}
67+
11468
}

‎Vuefront/Vuefront/ApiGraphql/model/common/page.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function getPages($data)
5656
if (isset($data['sort']) && in_array($data['sort'], array_keys($sort_data))) {
5757
$sort = $sort_data[$data['sort']];
5858
} else {
59-
$sort = "page_id";
59+
$sort = "sort_order";
6060
}
6161

6262
$collection->setOrder($sort, $order);

‎Vuefront/Vuefront/ApiGraphql/model/store/category.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function getCategories($data = array())
5656
if (isset($data['sort']) && in_array($data['sort'], array_keys($sort_data))) {
5757
$sort = $sort_data[$data['sort']];
5858
} else {
59-
$sort = "entity_id";
59+
$sort = "position";
6060
}
6161

6262
$collection->setOrder($sort, $order);

0 commit comments

Comments
 (0)