Cybage_Marketplace - Version 1.0.1

Version Notes

After installation of the Marketplace plug-in, please clear the cache.

Download this release

Release Info

Developer Cybage Software Pvt. Ltd.
Extension Cybage_Marketplace
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (28) hide show
  1. app/code/community/Cybage/Marketplace/Block/Adminhtml/Seller/Grid.php +1 -21
  2. app/code/community/Cybage/Marketplace/Block/Catalog/Product/List.php +4 -4
  3. app/code/community/Cybage/Marketplace/Helper/Data.php +10 -8
  4. app/code/community/Cybage/Marketplace/Model/Buyerseller.php +28 -23
  5. app/code/community/Cybage/Marketplace/Model/Marketplace.php +6 -5
  6. app/code/community/Cybage/Marketplace/Model/Observer.php +3 -2
  7. app/code/community/Cybage/Marketplace/Model/Resource/Customer.php +2 -2
  8. app/code/community/Cybage/Marketplace/Model/Resource/Orderby/Collection.php +2 -1
  9. app/code/community/Cybage/Marketplace/Model/Selleroptions.php +4 -2
  10. app/code/community/Cybage/Marketplace/controllers/AccountController.php +8 -1
  11. app/code/community/Cybage/Marketplace/controllers/OrderController.php +3 -4
  12. app/code/community/Cybage/Marketplace/controllers/ProductController.php +2 -2
  13. app/code/community/Cybage/Marketplace/etc/config.xml +1 -1
  14. app/code/community/Cybage/Marketplace/sql/marketplace_setup/mysql4-upgrade-0.1.1-0.1.2.php +1 -1
  15. app/code/community/Cybage/Marketplace/sql/marketplace_setup/mysql4-upgrade-0.1.2-0.1.3.php +1 -1
  16. app/code/community/Cybage/Marketplace/sql/marketplace_setup/mysql4-upgrade-0.1.6-0.1.7.php +27 -0
  17. app/design/frontend/base/default/template/marketplace/customer/account/myorders/items.phtml +7 -31
  18. app/design/frontend/base/default/template/marketplace/customer/account/myorders/shipitems.phtml +2 -18
  19. app/design/frontend/base/default/template/marketplace/customer/account/print.phtml +6 -30
  20. app/design/frontend/base/default/template/marketplace/customer/account/shiporder.phtml +9 -2
  21. app/design/frontend/base/default/template/marketplace/customer/account/vieworder.phtml +51 -47
  22. app/design/frontend/base/default/template/marketplace/customer/form/edit.phtml +1 -2
  23. app/design/frontend/base/default/template/marketplace/persistent/customer/form/register.phtml +1 -3
  24. app/design/frontend/base/default/template/marketplace/product/add.phtml +4 -3
  25. app/design/frontend/base/default/template/marketplace/sales/myorder/items/renderer/ship/default.phtml +6 -4
  26. app/design/frontend/base/default/template/marketplace/seller/info.phtml +1 -1
  27. app/design/frontend/base/default/template/marketplace/seller/logo.phtml +2 -2
  28. package.xml +6 -5
app/code/community/Cybage/Marketplace/Block/Adminhtml/Seller/Grid.php CHANGED
@@ -57,26 +57,6 @@ class Cybage_Marketplace_Block_Adminhtml_Seller_Grid extends Mage_Adminhtml_Bloc
57
  'width' => '150',
58
  'index' => 'email'
59
  ));
60
- /*
61
- $this->addColumn('store_name', array(
62
- 'header' => Mage::helper('marketplace')->__('Store Name'),
63
- 'align' => 'left',
64
- 'index' => 'store_name',
65
- 'width' => '250px',
66
- ));
67
-
68
- $this->addColumn('contact_no', array(
69
- 'header' => Mage::helper('marketplace')->__('Contact No'),
70
- 'align' => 'left',
71
- 'index' => 'contact_no',
72
- ));
73
-
74
- $this->addColumn('item_shipped_from', array(
75
- 'header' => Mage::helper('marketplace')->__('Item Shipped From'),
76
- 'align' => 'left',
77
- 'index' => 'item_shipped_from',
78
- ));
79
- */
80
 
81
  $this->addColumn('status', array(
82
  'header' => Mage::helper('marketplace')->__('Status'),
@@ -97,7 +77,7 @@ class Cybage_Marketplace_Block_Adminhtml_Seller_Grid extends Mage_Adminhtml_Bloc
97
  'caption' => Mage::helper('marketplace')->__('Edit'),
98
  'url' => array(
99
  'base'=>'*/*/edit',
100
- 'params'=>array('store'=>$storeId)
101
  ),
102
  'field' => 'id'
103
  )
57
  'width' => '150',
58
  'index' => 'email'
59
  ));
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
 
61
  $this->addColumn('status', array(
62
  'header' => Mage::helper('marketplace')->__('Status'),
77
  'caption' => Mage::helper('marketplace')->__('Edit'),
78
  'url' => array(
79
  'base'=>'*/*/edit',
80
+ 'params'=>array('store'=>$this->getParam('store',''))
81
  ),
82
  'field' => 'id'
83
  )
app/code/community/Cybage/Marketplace/Block/Catalog/Product/List.php CHANGED
@@ -48,11 +48,11 @@ class Cybage_Marketplace_Block_Catalog_Product_List extends Mage_Catalog_Block_P
48
  if ($_sellerIds) {
49
  $where .= " OR ce.value in (".implode(',', $_sellerIds).")";
50
  }
51
-
52
- $collection->getSelect()->joinLeft(array('ce' => 'catalog_product_entity_int'), 'ce.entity_id=e.entity_id AND ce.attribute_id='.Mage::helper('marketplace')->getProductSellerAttributeId(),null);
 
53
  $collection->getSelect()->where($where);
54
- }
55
-
56
  $this->_prodCollection = $collection;
57
  }
58
 
48
  if ($_sellerIds) {
49
  $where .= " OR ce.value in (".implode(',', $_sellerIds).")";
50
  }
51
+ $resource = Mage::getSingleton('core/resource');
52
+ $tableName = $resource->getTableName('catalog_product_entity_int');
53
+ $collection->getSelect()->joinLeft($tableName.' As ce', 'ce.entity_id=e.entity_id AND ce.attribute_id='.Mage::helper('marketplace')->getProductSellerAttributeId(),null);
54
  $collection->getSelect()->where($where);
55
+ }
 
56
  $this->_prodCollection = $collection;
57
  }
58
 
app/code/community/Cybage/Marketplace/Helper/Data.php CHANGED
@@ -75,7 +75,7 @@ class Cybage_Marketplace_Helper_Data extends Mage_Core_Helper_Abstract
75
  return Mage::getStoreConfig(self::MARKETPLACE_PRODUCT_STATE);
76
  }
77
 
78
- public function getNewProductUploadImageSize($check) {
79
  if ($check == 'validate') {
80
  return Mage::getStoreConfig(self::MARKETPLACE_PRODUCT_UPLOAD_IMAGE_SIZE);
81
  } else {
@@ -198,10 +198,11 @@ class Cybage_Marketplace_Helper_Data extends Mage_Core_Helper_Abstract
198
  ->addFieldToSelect('order_id')
199
  ->addFieldToFilter('main_table.seller_id', $sellerId)
200
  ->distinct(true);
201
-
 
202
  $orderItemCollection->getSelect()
203
- ->join('sales_flat_order', 'sales_flat_order.entity_id=main_table.order_id', array('increment_id', 'status'))
204
- ->columns(new Zend_Db_Expr("CONCAT(`sales_flat_order`.`customer_firstname`, ' ',`sales_flat_order`.`customer_lastname`) AS billname"));
205
 
206
  $orderItemCollection->getSelect()->columns('SUM(row_total + shipping_charges) AS Total');
207
  $orderItemCollection->getSelect()->columns('SUM(row_invoiced) AS Amount Received');
@@ -212,13 +213,13 @@ class Cybage_Marketplace_Helper_Data extends Mage_Core_Helper_Abstract
212
  $dateTo = date('Y-m-d H:i:s', strtotime($dateTo . "+1 day"));
213
 
214
  if ($dateFrom != '') {
215
- $orderItemCollection->addFieldToFilter('sales_flat_order.created_at', array('from' => "$dateFrom"));
216
  }
217
  if ($dateTo != '') {
218
- $orderItemCollection->addFieldToFilter('sales_flat_order.created_at', array('to' => "$dateTo"));
219
  }
220
  if ($orderStatus != '') {
221
- $orderItemCollection->addFieldToFilter('sales_flat_order.status', "$orderStatus");
222
  }
223
 
224
  return($orderItemCollection);
@@ -294,7 +295,8 @@ class Cybage_Marketplace_Helper_Data extends Mage_Core_Helper_Abstract
294
  $orderItemCollection = $marketPlaceModel->getOrderDetails($orderId);
295
 
296
  $orderTotal = array();
297
-
 
298
  foreach ($orderItemCollection as $_item) {
299
  $orderTotal['subtotal'] += (float) $_item->getRowTotal();
300
  $orderTotal['shippingcharge'] += (float) $_item->getShippingCharges();
75
  return Mage::getStoreConfig(self::MARKETPLACE_PRODUCT_STATE);
76
  }
77
 
78
+ public function getNewProductUploadImageSize($check=null) {
79
  if ($check == 'validate') {
80
  return Mage::getStoreConfig(self::MARKETPLACE_PRODUCT_UPLOAD_IMAGE_SIZE);
81
  } else {
198
  ->addFieldToSelect('order_id')
199
  ->addFieldToFilter('main_table.seller_id', $sellerId)
200
  ->distinct(true);
201
+ $resource = Mage::getSingleton("core/resource");
202
+ $tblSalesFlatOrder = $resource->getTableName('sales_flat_order');
203
  $orderItemCollection->getSelect()
204
+ ->join($tblSalesFlatOrder, $tblSalesFlatOrder.'.entity_id=main_table.order_id', array('increment_id', 'status'))
205
+ ->columns(new Zend_Db_Expr("CONCAT(`$tblSalesFlatOrder`.`customer_firstname`, ' ',`$tblSalesFlatOrder`.`customer_lastname`) AS billname"));
206
 
207
  $orderItemCollection->getSelect()->columns('SUM(row_total + shipping_charges) AS Total');
208
  $orderItemCollection->getSelect()->columns('SUM(row_invoiced) AS Amount Received');
213
  $dateTo = date('Y-m-d H:i:s', strtotime($dateTo . "+1 day"));
214
 
215
  if ($dateFrom != '') {
216
+ $orderItemCollection->addFieldToFilter($tblSalesFlatOrder.'.created_at', array('from' => "$dateFrom"));
217
  }
218
  if ($dateTo != '') {
219
+ $orderItemCollection->addFieldToFilter($tblSalesFlatOrder.'.created_at', array('to' => "$dateTo"));
220
  }
221
  if ($orderStatus != '') {
222
+ $orderItemCollection->addFieldToFilter($tblSalesFlatOrder.'.status', "$orderStatus");
223
  }
224
 
225
  return($orderItemCollection);
295
  $orderItemCollection = $marketPlaceModel->getOrderDetails($orderId);
296
 
297
  $orderTotal = array();
298
+ $orderTotal['subtotal'] = 0;
299
+ $orderTotal['shippingcharge'] = 0;
300
  foreach ($orderItemCollection as $_item) {
301
  $orderTotal['subtotal'] += (float) $_item->getRowTotal();
302
  $orderTotal['shippingcharge'] += (float) $_item->getShippingCharges();
app/code/community/Cybage/Marketplace/Model/Buyerseller.php CHANGED
@@ -105,9 +105,9 @@ class Cybage_Marketplace_Model_Buyerseller extends Mage_Core_Model_Abstract
105
  return true;
106
  }
107
 
108
- public function getActiveNotificationForOrder($oid,$pid) {
109
  if($pid) {
110
- $select =$this->read()->select()->from("marketplace_buyersellercomm_notifications","count('flag')")
111
  ->where("order_id=?",$oid)
112
  ->where("product_id=?",$pid)
113
  ->where("flag=?","1");
@@ -117,7 +117,7 @@ class Cybage_Marketplace_Model_Buyerseller extends Mage_Core_Model_Abstract
117
  return $data["count('flag')"];
118
  }
119
  } else {
120
- $select = $this->read()->select()->from("marketplace_buyersellercomm_notifications","count('flag')")
121
  ->where("order_id=?",$oid)
122
  ->where("flag=?","1");
123
  $result = $this->read()->fetchAll($select);
@@ -130,41 +130,46 @@ class Cybage_Marketplace_Model_Buyerseller extends Mage_Core_Model_Abstract
130
 
131
  public function getColection() {
132
  $params = Mage::app()->getRequest()->getParams();
133
- $oid =$params['order'];
 
 
 
134
  $pid =$params['product'];
 
135
  if(Mage::getSingleton('customer/session')->isLoggedIn()) {
136
  $customerData = Mage::getSingleton('customer/session')->getCustomer();
137
  $sellerId=$customerData->getId();
138
  }
139
  //Create query to gate prodcut name
 
140
  $selectProducNameId = $this->read()->select()
141
- ->from(array('ea' => 'eav_attribute'),array('ea.attribute_id'))
142
  ->where('ea.attribute_code=?','name')
143
- ->join(array('eet' => 'eav_entity_type'),'ea.entity_type_id = eet.entity_type_id',array())
144
  ->where('eet.entity_type_code=?','catalog_product');
145
  $producNameId = $this->read()->fetchOne($selectProducNameId);
146
 
147
  //Create query to gate customer first name ,last name
148
  $selectCustomerfirstnameId = $this->read()->select()
149
- ->from(array('ea' => 'eav_attribute'),array('ea.attribute_id'))
150
  ->where('ea.attribute_code =?','firstname')
151
- ->join(array('eet' => 'eav_entity_type'),'ea.entity_type_id = eet.entity_type_id',array())
152
  ->where('eet.entity_type_code=?','customer');
153
  $customerfirstnameId = $this->read()->fetchOne($selectCustomerfirstnameId);
154
 
155
  $selectCustomerLastNameId = $this->read()->select()
156
- ->from(array('ea' => 'eav_attribute'),array('ea.attribute_id'))
157
  ->where('ea.attribute_code =?','lastname')
158
- ->join(array('eet' => 'eav_entity_type'),'ea.entity_type_id = eet.entity_type_id',array())
159
  ->where('eet.entity_type_code=?','customer');
160
  $customerLastNameId = $this->read()->fetchOne($selectCustomerLastNameId);
161
 
162
- if($pid) {
163
- $select = $this->read()->select()->from(array('buyer'=>'marketplace_buyersellercomm_notifications'),
164
  array('sales.increment_id','prod.value','comment','created_at','sales.customer_firstname','sales.customer_lastname'))
165
- ->joinLeft(array('sales'=>'sales_flat_order'),
166
  'buyer.order_id = sales.entity_id',array())
167
- ->joinLeft(array('prod'=>'catalog_product_entity_varchar'),
168
  'buyer.product_id = prod.entity_id',array())
169
  ->where('buyer.product_id=?',$pid)
170
  ->where('buyer.order_id=?',$oid)
@@ -173,29 +178,29 @@ class Cybage_Marketplace_Model_Buyerseller extends Mage_Core_Model_Abstract
173
  ->where('prod.store_id=?',Mage::app()->getStore()->getCode());
174
  } else {
175
  $select = $this->read()->select()
176
- ->from(array('buyer'=>'marketplace_buyersellercomm_notifications'),
177
  array("prod.value","comment","created_at","sales.seller_id","buyer.customer_id",new Zend_Db_Expr("CONCAT_WS(' ', custfirstname.value, custlastname.value) as fullname")))
178
  ->where('buyer.order_id=?',$oid)
179
- ->joinLeft(array('prod'=>'catalog_product_entity_varchar'),
180
  'buyer.product_id = prod.entity_id',array())
181
  //Remove hard coded value for product name and added by query
182
  ->where('prod.attribute_id=?',$producNameId)
183
  ->where('prod.store_id=?',Mage::app()->getStore()->getCode())
184
- ->joinLeft(array('sales'=>'sales_flat_order_item'),
185
  'buyer.order_id = sales.order_id',array())
186
  //Added seller condition
187
  ->where('sales.seller_id=?',$sellerId)
188
- ->joinLeft(array('custfirstname'=>'customer_entity_varchar'),
189
  'buyer.customer_id = custfirstname.entity_id',array())
190
  //Remove hard coded value for customer name and added by query
191
  ->where('custfirstname.attribute_id=?',$customerfirstnameId)
192
- ->joinLeft(array('custlastname'=>'customer_entity_varchar'),
193
  'buyer.customer_id = custlastname.entity_id',array())
194
  ->where('custlastname.attribute_id=?',$customerLastNameId);
195
  }
196
 
197
  $result = $this->read()->fetchAll($select);
198
-
199
  foreach ($result as $data) {
200
  $collection[] = array($data);
201
  }
@@ -226,7 +231,7 @@ class Cybage_Marketplace_Model_Buyerseller extends Mage_Core_Model_Abstract
226
 
227
  $orderIds = implode(', ',$arr_order_for_filter);
228
  if($orderIds) {
229
- $select = $this->read()->select()->from("marketplace_buyersellercomm_notifications","count('flag')")
230
  ->where("order_id IN (".$orderIds.")")
231
  ->where("flag=?","1");
232
  $result = $this->read()->fetchAll($select);
@@ -269,7 +274,7 @@ class Cybage_Marketplace_Model_Buyerseller extends Mage_Core_Model_Abstract
269
  }
270
 
271
  public function getSellerInfo($order) {
272
- $select = $this->read()->select()->distinct(true)->from(array('sales'=>'sales_flat_order_item'),
273
  array('seller_id'))
274
  ->where('sales.order_id=?',$order);
275
  $result = $this->read()->fetchAll($select);
@@ -280,7 +285,7 @@ class Cybage_Marketplace_Model_Buyerseller extends Mage_Core_Model_Abstract
280
  }
281
 
282
  public function getBuyerinfo($orderid) {
283
- $select = $this->read()->select()->distinct(true)->from(array('sales'=>'sales_flat_order'),
284
  array('customer_email','customer_firstname','customer_lastname'))
285
  ->where('sales.entity_id=?',$orderid);
286
  $result = $this->read()->fetchAll($select);
105
  return true;
106
  }
107
 
108
+ public function getActiveNotificationForOrder($oid,$pid=null) {
109
  if($pid) {
110
+ $select =$this->read()->select()->from($this->resource()->getTableName("marketplace_buyersellercomm_notifications"),"count('flag')")
111
  ->where("order_id=?",$oid)
112
  ->where("product_id=?",$pid)
113
  ->where("flag=?","1");
117
  return $data["count('flag')"];
118
  }
119
  } else {
120
+ $select = $this->read()->select()->from($this->resource()->getTableName("marketplace_buyersellercomm_notifications"),"count('flag')")
121
  ->where("order_id=?",$oid)
122
  ->where("flag=?","1");
123
  $result = $this->read()->fetchAll($select);
130
 
131
  public function getColection() {
132
  $params = Mage::app()->getRequest()->getParams();
133
+ if(!empty($params['order'])){
134
+ $oid =$params['order'];
135
+ }
136
+ if(!empty($params['product'])){
137
  $pid =$params['product'];
138
+ }
139
  if(Mage::getSingleton('customer/session')->isLoggedIn()) {
140
  $customerData = Mage::getSingleton('customer/session')->getCustomer();
141
  $sellerId=$customerData->getId();
142
  }
143
  //Create query to gate prodcut name
144
+
145
  $selectProducNameId = $this->read()->select()
146
+ ->from(array('ea' => $this->resource()->getTableName('eav_attribute')),array('ea.attribute_id'))
147
  ->where('ea.attribute_code=?','name')
148
+ ->join(array('eet' => $this->resource()->getTableName('eav_entity_type')),'ea.entity_type_id = eet.entity_type_id',array())
149
  ->where('eet.entity_type_code=?','catalog_product');
150
  $producNameId = $this->read()->fetchOne($selectProducNameId);
151
 
152
  //Create query to gate customer first name ,last name
153
  $selectCustomerfirstnameId = $this->read()->select()
154
+ ->from(array('ea' => $this->resource()->getTableName('eav_attribute')),array('ea.attribute_id'))
155
  ->where('ea.attribute_code =?','firstname')
156
+ ->join(array('eet' => $this->resource()->getTableName('eav_entity_type')),'ea.entity_type_id = eet.entity_type_id',array())
157
  ->where('eet.entity_type_code=?','customer');
158
  $customerfirstnameId = $this->read()->fetchOne($selectCustomerfirstnameId);
159
 
160
  $selectCustomerLastNameId = $this->read()->select()
161
+ ->from(array('ea' => $this->resource()->getTableName('eav_attribute')),array('ea.attribute_id'))
162
  ->where('ea.attribute_code =?','lastname')
163
+ ->join(array('eet' => $this->resource()->getTableName('eav_entity_type')),'ea.entity_type_id = eet.entity_type_id',array())
164
  ->where('eet.entity_type_code=?','customer');
165
  $customerLastNameId = $this->read()->fetchOne($selectCustomerLastNameId);
166
 
167
+ if(!empty($pid)) {
168
+ $select = $this->read()->select()->from(array('buyer'=>$this->resource()->getTableName('marketplace_buyersellercomm_notifications')),
169
  array('sales.increment_id','prod.value','comment','created_at','sales.customer_firstname','sales.customer_lastname'))
170
+ ->joinLeft(array('sales'=>$this->resource()->getTableName('sales_flat_order')),
171
  'buyer.order_id = sales.entity_id',array())
172
+ ->joinLeft(array('prod'=>$this->resource()->getTableName('catalog_product_entity_varchar')),
173
  'buyer.product_id = prod.entity_id',array())
174
  ->where('buyer.product_id=?',$pid)
175
  ->where('buyer.order_id=?',$oid)
178
  ->where('prod.store_id=?',Mage::app()->getStore()->getCode());
179
  } else {
180
  $select = $this->read()->select()
181
+ ->from(array('buyer'=>$this->resource()->getTableName('marketplace_buyersellercomm_notifications')),
182
  array("prod.value","comment","created_at","sales.seller_id","buyer.customer_id",new Zend_Db_Expr("CONCAT_WS(' ', custfirstname.value, custlastname.value) as fullname")))
183
  ->where('buyer.order_id=?',$oid)
184
+ ->joinLeft(array('prod'=>$this->resource()->getTableName('catalog_product_entity_varchar')),
185
  'buyer.product_id = prod.entity_id',array())
186
  //Remove hard coded value for product name and added by query
187
  ->where('prod.attribute_id=?',$producNameId)
188
  ->where('prod.store_id=?',Mage::app()->getStore()->getCode())
189
+ ->joinLeft(array('sales'=>$this->resource()->getTableName('sales_flat_order_item')),
190
  'buyer.order_id = sales.order_id',array())
191
  //Added seller condition
192
  ->where('sales.seller_id=?',$sellerId)
193
+ ->joinLeft(array('custfirstname'=>$this->resource()->getTableName('customer_entity_varchar')),
194
  'buyer.customer_id = custfirstname.entity_id',array())
195
  //Remove hard coded value for customer name and added by query
196
  ->where('custfirstname.attribute_id=?',$customerfirstnameId)
197
+ ->joinLeft(array('custlastname'=>$this->resource()->getTableName('customer_entity_varchar')),
198
  'buyer.customer_id = custlastname.entity_id',array())
199
  ->where('custlastname.attribute_id=?',$customerLastNameId);
200
  }
201
 
202
  $result = $this->read()->fetchAll($select);
203
+ $collection= array();
204
  foreach ($result as $data) {
205
  $collection[] = array($data);
206
  }
231
 
232
  $orderIds = implode(', ',$arr_order_for_filter);
233
  if($orderIds) {
234
+ $select = $this->read()->select()->from($this->resource()->getTableName("marketplace_buyersellercomm_notifications","count('flag')"))
235
  ->where("order_id IN (".$orderIds.")")
236
  ->where("flag=?","1");
237
  $result = $this->read()->fetchAll($select);
274
  }
275
 
276
  public function getSellerInfo($order) {
277
+ $select = $this->read()->select()->distinct(true)->from(array('sales'=>$this->resource()->getTableName('sales_flat_order_item')),
278
  array('seller_id'))
279
  ->where('sales.order_id=?',$order);
280
  $result = $this->read()->fetchAll($select);
285
  }
286
 
287
  public function getBuyerinfo($orderid) {
288
+ $select = $this->read()->select()->distinct(true)->from(array('sales'=>$this->resource()->getTableName('sales_flat_order')),
289
  array('customer_email','customer_firstname','customer_lastname'))
290
  ->where('sales.entity_id=?',$orderid);
291
  $result = $this->read()->fetchAll($select);
app/code/community/Cybage/Marketplace/Model/Marketplace.php CHANGED
@@ -81,9 +81,10 @@ class Cybage_Marketplace_Model_Marketplace extends Mage_Core_Model_Abstract
81
  //Get Seller_id attribute id
82
  $_product = Mage::getModel('catalog/product');
83
  $attributeId = $_product->getResource()->getAttribute('seller_id')->getAttributeId();
 
84
  $select = $connectionRead->select('coe.entity_id')
85
- ->from('catalog_product_entity As coe')
86
- ->joinLeft(array('cpet' => 'catalog_product_entity_int'), 'coe.entity_id = cpet.entity_id')
87
  ->where('attribute_id=?', $attributeId)
88
  ->where('value=?', $customerId);
89
  $sellerProducts = $connectionRead->fetchCol($select);
@@ -106,10 +107,10 @@ class Cybage_Marketplace_Model_Marketplace extends Mage_Core_Model_Abstract
106
  /* Get question count for which reply not present. */
107
  public function getUnrepliedQueCount() {
108
  $unrepliedQueCount = 0;
109
- $subselect = $this->read()->select()->distinct(true)->from(array('q' => 'marketplace_askquestion_question'), array('q.entity_id'))
110
- ->joinRight(array('r' => 'marketplace_askquestion_reply'), ' q.entity_id = r.parent_id', array());
111
 
112
- $select = $this->read()->select()->from(array("q" => "marketplace_askquestion_question"), array("count(distinct q.entity_id)"))
113
  ->where("q.entity_id not in ($subselect)");
114
 
115
  if ($product_str = implode(",", $this->getSellersProducts())) {
81
  //Get Seller_id attribute id
82
  $_product = Mage::getModel('catalog/product');
83
  $attributeId = $_product->getResource()->getAttribute('seller_id')->getAttributeId();
84
+
85
  $select = $connectionRead->select('coe.entity_id')
86
+ ->from($this->resource()->getTableName('catalog_product_entity').' As coe')
87
+ ->joinLeft(array('cpet' => $this->resource()->getTableName('catalog_product_entity_int')), 'coe.entity_id = cpet.entity_id')
88
  ->where('attribute_id=?', $attributeId)
89
  ->where('value=?', $customerId);
90
  $sellerProducts = $connectionRead->fetchCol($select);
107
  /* Get question count for which reply not present. */
108
  public function getUnrepliedQueCount() {
109
  $unrepliedQueCount = 0;
110
+ $subselect = $this->read()->select()->distinct(true)->from(array('q' => $this->resource()->getTableName('marketplace_askquestion_question')), array('q.entity_id'))
111
+ ->joinRight(array('r' => $this->resource()->getTableName('marketplace_askquestion_reply')), ' q.entity_id = r.parent_id', array());
112
 
113
+ $select = $this->read()->select()->from(array("q" => $this->resource()->getTableName("marketplace_askquestion_question")), array("count(distinct q.entity_id)"))
114
  ->where("q.entity_id not in ($subselect)");
115
 
116
  if ($product_str = implode(",", $this->getSellersProducts())) {
app/code/community/Cybage/Marketplace/Model/Observer.php CHANGED
@@ -100,9 +100,10 @@ class Cybage_Marketplace_Model_Observer {
100
  public function pendingorders()
101
  {
102
  $daylimit = Mage::getStoreConfig('marketplace/seller/order_pending_before_days',Mage::app()->getStore());
103
- $date1=date("Y-m-d H:i:s", Mage::getModel('core/date')->timestamp(strtotime('-'.$daylimit.'day', time())));
 
104
  $orderItemsCollection = Mage::getResourceModel('sales/order_item_collection');
105
- $orderItemsCollection->getSelect()->join(array('sfo' =>'sales_flat_order'), 'main_table.order_id = sfo.entity_id', array('sfo.entity_id','sfo.status','sfo.created_at'));
106
  $orderItemsCollection->addAttributeToFilter('sfo.created_at',array('lteq' =>$date1));
107
  $orderItemsCollection->addAttributeToFilter('status', array('eq' =>'pending'));
108
 
100
  public function pendingorders()
101
  {
102
  $daylimit = Mage::getStoreConfig('marketplace/seller/order_pending_before_days',Mage::app()->getStore());
103
+ $date1=date("Y-m-d H:i:s", Mage::getModel('core/date')->timestamp(strtotime('-'.$daylimit.'day', time())));
104
+ $resource = Mage::getSingleton("core/resource");
105
  $orderItemsCollection = Mage::getResourceModel('sales/order_item_collection');
106
+ $orderItemsCollection->getSelect()->join(array('sfo' =>$resource->getTableName('sales_flat_order')), 'main_table.order_id = sfo.entity_id', array('sfo.entity_id','sfo.status','sfo.created_at'));
107
  $orderItemsCollection->addAttributeToFilter('sfo.created_at',array('lteq' =>$date1));
108
  $orderItemsCollection->addAttributeToFilter('status', array('eq' =>'pending'));
109
 
app/code/community/Cybage/Marketplace/Model/Resource/Customer.php CHANGED
@@ -66,9 +66,9 @@ class Cybage_Marketplace_Model_Resource_Customer extends Mage_Customer_Model_Res
66
  /*Check if same company name already exist*/
67
  $writeAdapter = $this->_getWriteAdapter();
68
  $companybind = array('company_name' => $customer->getCompanyName());
69
-
70
  $compselect = $writeAdapter->select()
71
- ->from('customer_entity_varchar', array($this->getEntityIdField()))
72
  ->where('value = :company_name AND attribute_id ='.$companyAttrId);
73
 
74
  if ($customer->getId()) {
66
  /*Check if same company name already exist*/
67
  $writeAdapter = $this->_getWriteAdapter();
68
  $companybind = array('company_name' => $customer->getCompanyName());
69
+ $resource = Mage::getSingleton("core/resource");
70
  $compselect = $writeAdapter->select()
71
+ ->from($resource->getTableName('customer_entity_varchar'), array($this->getEntityIdField()))
72
  ->where('value = :company_name AND attribute_id ='.$companyAttrId);
73
 
74
  if ($customer->getId()) {
app/code/community/Cybage/Marketplace/Model/Resource/Orderby/Collection.php CHANGED
@@ -229,7 +229,8 @@ class Cybage_Marketplace_Model_Resource_Orderby_Collection extends Mage_Core_Mod
229
  if (!is_array($orderStatus)) {
230
  $orderStatus = array($orderStatus);
231
  }
232
- $this->getSelect()->join(array('sfo' =>'sales_flat_order'), $this->_tablealias.'.order_id = sfo.entity_id', array('sfo.entity_id','sfo.status'));
 
233
  $this->getSelect()->where('sfo.status IN(?)', $orderStatus);
234
  return $this;
235
  }
229
  if (!is_array($orderStatus)) {
230
  $orderStatus = array($orderStatus);
231
  }
232
+ $resource = Mage::getSingleton("core/resource");
233
+ $this->getSelect()->join(array('sfo' =>$resource->getTableName('sales_flat_order')), $this->_tablealias.'.order_id = sfo.entity_id', array('sfo.entity_id','sfo.status'));
234
  $this->getSelect()->where('sfo.status IN(?)', $orderStatus);
235
  return $this;
236
  }
app/code/community/Cybage/Marketplace/Model/Selleroptions.php CHANGED
@@ -39,7 +39,8 @@ class Cybage_Marketplace_Model_Selleroptions extends Mage_Core_Model_Abstract
39
  $seller = Mage::helper('marketplace')->getSellerInfo($sellerName);
40
  $_sellerId = $seller['entity_id'];
41
 
42
- $_avgRating = $_percent = $_prodCount = $_reviewCount = $optionCount= 0;
 
43
  $_sellerReviewData = array();
44
 
45
  $_productCollection = Mage::getResourceModel('catalog/product_collection')
@@ -81,7 +82,8 @@ class Cybage_Marketplace_Model_Selleroptions extends Mage_Core_Model_Abstract
81
  }
82
 
83
  public function getSellerAllRatingsAggregate($_sellerId) {
84
- $_avgRating = $_percent = $_prodCount = $_reviewCount = $optionCount= 0;
 
85
  $_sellerReviewData = array();
86
 
87
  $_productCollection = Mage::getResourceModel('catalog/product_collection')
39
  $seller = Mage::helper('marketplace')->getSellerInfo($sellerName);
40
  $_sellerId = $seller['entity_id'];
41
 
42
+ $_avgRating = $_percent = $_prodCount = $_reviewCount = 0;
43
+ $optionCount = 1;
44
  $_sellerReviewData = array();
45
 
46
  $_productCollection = Mage::getResourceModel('catalog/product_collection')
82
  }
83
 
84
  public function getSellerAllRatingsAggregate($_sellerId) {
85
+ $_avgRating = $_percent = $_prodCount = $_reviewCount = 0;
86
+ $optionCount = 1;
87
  $_sellerReviewData = array();
88
 
89
  $_productCollection = Mage::getResourceModel('catalog/product_collection')
app/code/community/Cybage/Marketplace/controllers/AccountController.php CHANGED
@@ -25,12 +25,19 @@ class Cybage_Marketplace_AccountController extends Mage_Customer_AccountControll
25
  * Create customer account action
26
  */
27
  public function createPostAction()
28
- {
 
29
  $session = $this->_getSession();
30
  if ($session->isLoggedIn()) {
31
  $this->_redirect('*/*/');
32
  return;
33
  }
 
 
 
 
 
 
34
 
35
  $session->setEscapeMessages(true); // prevent XSS injection in user input
36
  if ($this->getRequest()->isPost()) {
25
  * Create customer account action
26
  */
27
  public function createPostAction()
28
+ {
29
+
30
  $session = $this->_getSession();
31
  if ($session->isLoggedIn()) {
32
  $this->_redirect('*/*/');
33
  return;
34
  }
35
+
36
+ $isMarketplaceEnabled = Mage::Helper("marketplace")->isMarketplaceEnabled();
37
+ if($isMarketplaceEnabled == false)
38
+ {
39
+ return parent::createPostAction();
40
+ }
41
 
42
  $session->setEscapeMessages(true); // prevent XSS injection in user input
43
  if ($this->getRequest()->isPost()) {
app/code/community/Cybage/Marketplace/controllers/OrderController.php CHANGED
@@ -46,8 +46,7 @@ class Cybage_Marketplace_OrderController extends Mage_Core_Controller_Front_Acti
46
  $comment = isset($data['sellerform_comment'])? trim(strip_tags($data['sellerform_comment'])) : '';
47
  $trackingNo = isset($data['trackin_no']) ? $data['trackin_no']:'';
48
 
49
- $order->save();
50
- $processOrder = $order->processOrder($data['status'],$orderId,$trackingNo,$comment);
51
 
52
  if($notify) {
53
  /*Get Buyer information*/
@@ -61,10 +60,10 @@ class Cybage_Marketplace_OrderController extends Mage_Core_Controller_Front_Acti
61
  $order->sendOrderStatusEmail(($data['status']), $buyerEmail, $buyerName, $comment, $orderId, $sellerEmail,$sellerName);
62
  }
63
 
64
- if($processOrder) {
65
  Mage::getSingleton('core/session')->addSuccess('Order status is updated.');
66
  $this->_redirect('marketplace/account/vieworder',$arguement=array('order_id' => $orderId));
67
- }
68
  } else {
69
  Mage::getModel('core/session')->addError("Invoice is not generated for this order,please contact administrator.");
70
  $this->_redirect('marketplace/account/vieworder',$arguement=array('order_id' => $orderId));
46
  $comment = isset($data['sellerform_comment'])? trim(strip_tags($data['sellerform_comment'])) : '';
47
  $trackingNo = isset($data['trackin_no']) ? $data['trackin_no']:'';
48
 
49
+ $order->save();
 
50
 
51
  if($notify) {
52
  /*Get Buyer information*/
60
  $order->sendOrderStatusEmail(($data['status']), $buyerEmail, $buyerName, $comment, $orderId, $sellerEmail,$sellerName);
61
  }
62
 
63
+
64
  Mage::getSingleton('core/session')->addSuccess('Order status is updated.');
65
  $this->_redirect('marketplace/account/vieworder',$arguement=array('order_id' => $orderId));
66
+
67
  } else {
68
  Mage::getModel('core/session')->addError("Invoice is not generated for this order,please contact administrator.");
69
  $this->_redirect('marketplace/account/vieworder',$arguement=array('order_id' => $orderId));
app/code/community/Cybage/Marketplace/controllers/ProductController.php CHANGED
@@ -367,7 +367,7 @@ class Cybage_Marketplace_ProductController extends Mage_Core_Controller_Front_Ac
367
  $uploadedFile = $path1 . $uploader->getUploadedFileName();
368
  $mediaArray[$key] = $uploadedFile;
369
  } catch (Exception $e) {
370
- $this->_getSession()->addError($e->getMessage());
371
  //die($e->getMessage());
372
  }
373
  }
@@ -401,7 +401,7 @@ class Cybage_Marketplace_ProductController extends Mage_Core_Controller_Front_Ac
401
  * @param : $action(edit or add or delete), $result (success or failure),$productId(Mage_Catalog_Product_Model)
402
  * @return : void
403
  */
404
- public function saveLoggingAction($action,$result,$productId,$sellerId)
405
  {
406
  return Mage::getModel('marketplace/logging')->saveProductLog($action,$result,$productId,$sellerId);
407
  }
367
  $uploadedFile = $path1 . $uploader->getUploadedFileName();
368
  $mediaArray[$key] = $uploadedFile;
369
  } catch (Exception $e) {
370
+ $this->_getSession()->addError("The selected file can't be uploaded.");
371
  //die($e->getMessage());
372
  }
373
  }
401
  * @param : $action(edit or add or delete), $result (success or failure),$productId(Mage_Catalog_Product_Model)
402
  * @return : void
403
  */
404
+ public function saveLoggingAction($action,$result,$productId,$sellerId=null)
405
  {
406
  return Mage::getModel('marketplace/logging')->saveProductLog($action,$result,$productId,$sellerId);
407
  }
app/code/community/Cybage/Marketplace/etc/config.xml CHANGED
@@ -22,7 +22,7 @@
22
  <config>
23
  <modules>
24
  <Cybage_Marketplace>
25
- <version>0.1.6</version>
26
  </Cybage_Marketplace>
27
  </modules>
28
  <frontend>
22
  <config>
23
  <modules>
24
  <Cybage_Marketplace>
25
+ <version>0.1.8</version>
26
  </Cybage_Marketplace>
27
  </modules>
28
  <frontend>
app/code/community/Cybage/Marketplace/sql/marketplace_setup/mysql4-upgrade-0.1.1-0.1.2.php CHANGED
@@ -18,7 +18,7 @@
18
  * @author Cybage Software Pvt. Ltd. <Support_Magento@cybage.com>
19
  */
20
 
21
- $installer = new Mage_Sales_Model_Resource_Setup;
22
  $installer->startSetup();
23
  $attribute = array(
24
  'type' => 'int',
18
  * @author Cybage Software Pvt. Ltd. <Support_Magento@cybage.com>
19
  */
20
 
21
+ $installer = new Mage_Sales_Model_Resource_Setup('core_setup');
22
  $installer->startSetup();
23
  $attribute = array(
24
  'type' => 'int',
app/code/community/Cybage/Marketplace/sql/marketplace_setup/mysql4-upgrade-0.1.2-0.1.3.php CHANGED
@@ -18,7 +18,7 @@
18
  * @author Cybage Software Pvt. Ltd. <Support_Magento@cybage.com>
19
  */
20
 
21
- $installer = new Mage_Sales_Model_Resource_Setup;
22
  $installer->startSetup();
23
  $attribute = array(
24
  'type' => 'int',
18
  * @author Cybage Software Pvt. Ltd. <Support_Magento@cybage.com>
19
  */
20
 
21
+ $installer = new Mage_Sales_Model_Resource_Setup('core_setup');
22
  $installer->startSetup();
23
  $attribute = array(
24
  'type' => 'int',
app/code/community/Cybage/Marketplace/sql/marketplace_setup/mysql4-upgrade-0.1.6-0.1.7.php ADDED
@@ -0,0 +1,27 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Cybage Marketplace Plugin
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * It is available on the World Wide Web at:
9
+ * http://opensource.org/licenses/osl-3.0.php
10
+ * If you are unable to access it on the World Wide Web, please send an email
11
+ * To: Support_Magento@cybage.com. We will send you a copy of the source file.
12
+ *
13
+ * @category Marketplace Plugin
14
+ * @package Cybage_Marketplace
15
+ * @copyright Copyright (c) 2014 Cybage Software Pvt. Ltd., India
16
+ * http://www.cybage.com/pages/centers-of-excellence/ecommerce/ecommerce.aspx
17
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
18
+ * @author Cybage Software Pvt. Ltd. <Support_Magento@cybage.com>
19
+ */
20
+
21
+ $installer = $this;
22
+ $installer->startSetup();
23
+ $installer->run("
24
+ UPDATE `{$installer->getTable('eav/attribute')}` set `is_user_defined` = 1 where `attribute_code` = 'seller_id';
25
+ ");
26
+
27
+ $installer->endSetup();
app/design/frontend/base/default/template/marketplace/customer/account/myorders/items.phtml CHANGED
@@ -29,6 +29,7 @@
29
  <col width="1" />
30
  <col width="1" />
31
  <col width="1" />
 
32
  <thead>
33
  <tr>
34
  <th><?php echo $this->__('Product Name') ?></th>
@@ -36,7 +37,7 @@
36
  <th class="a-center"><?php echo $this->__('Price') ?></th>
37
  <th class="a-center"><?php echo $this->__('Qty') ?></th>
38
  <th class="a-center"><?php echo $this->__('Subtotal') ?></th>
39
- <th class="a-center"><?php echo $this->__('Notification') ?></th>
40
  </tr>
41
  </thead>
42
  <?php $_count = $subtotal = $shippingCharge = $grandTotal = 0; ?>
@@ -47,42 +48,17 @@
47
  <tbody>
48
  <?php echo $this->getItemHtml($_item) ?>
49
  </tbody>
 
50
  <?php endforeach; ?>
51
 
52
  <!--Calculate subtotal,shipping charge and grandtotal-->
53
- <tfoot>
54
  <tr>
55
- <td colspan="4" style="text-align: right;"><?php echo $this->__('Subtotal') ?></td>
56
  <td style="text-align: right;">
57
- <?php echo Mage::helper('core')->currency($marketPlaceOrderObj->getSubtotal(), true, false);?>
58
  </td>
59
- </tr>
60
- <tr>
61
- <td colspan="4" style="text-align: right;"><?php echo $this->__('Shipping & Handling') ?></td>
62
- <td style="text-align: right;">
63
- <?php echo Mage::helper('core')->currency($marketPlaceOrderObj->getShippingAmount(), true, false);?>
64
- </td>
65
- </tr>
66
- <?php if ($discountAmount = $marketPlaceOrderObj->getDiscountAmount() > 0) {
67
- if ($marketPlaceOrderObj->getDiscountDescription()) {
68
- $discountLabel = $this->__('Discount (%s)', $marketPlaceOrderObj->getDiscountDescription());
69
- } else {
70
- $discountLabel = $this->__('Discount');
71
- }
72
- ?>
73
- <tr>
74
- <td colspan="4" style="text-align: right;"><?php echo $this->__($discountLabel) ?></td>
75
- <td style="text-align: right;">
76
- <?php echo Mage::helper('core')->currency($discountAmount, true, false);?>
77
- </td>
78
- </tr>
79
- <?php }?>
80
- <tr>
81
- <td colspan="4" style="text-align: right;"> <strong> <?php echo $this->__('Grandtotal') ?> </strong> </td>
82
- <td style="text-align: right;">
83
- <strong> <?php echo Mage::helper('core')->currency($marketPlaceOrderObj->getGrandTotal(), true, false);?></strong>
84
- </td>
85
- </tr>
86
  </tfoot>
87
  <!--Calculate subtotal,shipping charge and grandtotal-->
88
  <?php endif;?>
29
  <col width="1" />
30
  <col width="1" />
31
  <col width="1" />
32
+ <col width="1" />
33
  <thead>
34
  <tr>
35
  <th><?php echo $this->__('Product Name') ?></th>
37
  <th class="a-center"><?php echo $this->__('Price') ?></th>
38
  <th class="a-center"><?php echo $this->__('Qty') ?></th>
39
  <th class="a-center"><?php echo $this->__('Subtotal') ?></th>
40
+ <th class="a-center"><?php echo $this->__('Notification') ?></th>
41
  </tr>
42
  </thead>
43
  <?php $_count = $subtotal = $shippingCharge = $grandTotal = 0; ?>
48
  <tbody>
49
  <?php echo $this->getItemHtml($_item) ?>
50
  </tbody>
51
+ <?php $subtotal += (float)$_item->getRowTotal();?>
52
  <?php endforeach; ?>
53
 
54
  <!--Calculate subtotal,shipping charge and grandtotal-->
55
+ <tfoot>
56
  <tr>
57
+ <td colspan="4" style="text-align: right;"><?php echo $this->__('Total') ?></td>
58
  <td style="text-align: right;">
59
+ <?php echo Mage::helper('core')->currency($subtotal, true, false);?>
60
  </td>
61
+ </tr>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
62
  </tfoot>
63
  <!--Calculate subtotal,shipping charge and grandtotal-->
64
  <?php endif;?>
app/design/frontend/base/default/template/marketplace/customer/account/myorders/shipitems.phtml CHANGED
@@ -53,27 +53,11 @@
53
  <!--Calculate subtotal,shipping charge and grandtotal-->
54
  <tfoot>
55
  <tr>
56
- <td style="text-align: right;" colspan="5"><?php echo $this->__('Subtotal') ?></td>
57
  <td style="text-align: right;">
58
  <?php echo $fomattedSubtotal = Mage::helper('core')->currency($subtotal, true, false);?>
59
  </td>
60
- </tr>
61
- <tr>
62
- <td style="text-align: right;" colspan="5"><?php echo $this->__('Shipping & Handling') ?></td>
63
- <td style="text-align: right;">
64
- <?php echo $formtattedShipCharge = Mage::helper('core')->currency($shippingCharge, true, false);?>
65
- </td>
66
- </tr>
67
- <tr>
68
- <?php if($subtotal || $shiipingCharge):?>
69
- <td style="text-align: right;" colspan="5"><?php echo $this->__('Grandtotal') ?></td>
70
- <td style="text-align: right;">
71
- <?php $grandTotal = $subtotal + $shippingCharge;?>
72
- <?php echo $grandTotal = Mage::helper('core')->currency($grandTotal, true, false);?>
73
- </td>
74
- <?php endif;?>
75
-
76
- </tr>
77
  </tfoot>
78
  <!--Calculate subtotal,shipping charge and grandtotal-->
79
  <?php endif;?>
53
  <!--Calculate subtotal,shipping charge and grandtotal-->
54
  <tfoot>
55
  <tr>
56
+ <td style="text-align: right;" colspan="5"><?php echo $this->__('Total') ?></td>
57
  <td style="text-align: right;">
58
  <?php echo $fomattedSubtotal = Mage::helper('core')->currency($subtotal, true, false);?>
59
  </td>
60
+ </tr>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
61
  </tfoot>
62
  <!--Calculate subtotal,shipping charge and grandtotal-->
63
  <?php endif;?>
app/design/frontend/base/default/template/marketplace/customer/account/print.phtml CHANGED
@@ -68,46 +68,22 @@
68
  <?php
69
  $orderItemCollection = $_order->getOrderDetails($orderId);
70
  $_count = $orderItemCollection->count();
 
71
  foreach ($orderItemCollection as $_item):
72
  if ($_item->getParentItem()) continue;
73
  ?>
74
  <tbody>
75
  <?php echo $this->getItemHtml($_item) ?>
76
  </tbody>
 
77
  <?php endforeach; ?>
78
- <tfoot>
79
  <tr>
80
- <td colspan="4" style="text-align: right;"><?php echo $this->__('Subtotal') ?></td>
81
  <td style="text-align: right;">
82
- <?php echo Mage::helper('core')->currency($_order->getSubtotal(), true, false);?>
83
  </td>
84
- </tr>
85
- <tr>
86
- <td colspan="4" style="text-align: right;"><?php echo $this->__('Shipping & Handling') ?></td>
87
- <td style="text-align: right;">
88
- <?php echo Mage::helper('core')->currency($_order->getShippingAmount(), true, false);?>
89
- </td>
90
- </tr>
91
- <?php if ($discountAmount = $_order->getDiscountAmount() > 0) {
92
- if ($_order->getDiscountDescription()) {
93
- $discountLabel = $this->__('Discount (%s)', $_order->getDiscountDescription());
94
- } else {
95
- $discountLabel = $this->__('Discount');
96
- }
97
- ?>
98
- <tr>
99
- <td colspan="4" style="text-align: right;"><?php echo $this->__($discountLabel) ?></td>
100
- <td style="text-align: right;">
101
- <?php echo Mage::helper('core')->currency($discountAmount, true, false);?>
102
- </td>
103
- </tr>
104
- <?php }?>
105
- <tr>
106
- <td colspan="4" style="text-align: right;"> <strong> <?php echo $this->__('Grandtotal') ?> </strong> </td>
107
- <td style="text-align: right;">
108
- <strong> <?php echo Mage::helper('core')->currency($_order->getGrandTotal(), true, false);?></strong>
109
- </td>
110
- </tr>
111
  </tfoot>
112
  </table>
113
  <div class="buttons-set">
68
  <?php
69
  $orderItemCollection = $_order->getOrderDetails($orderId);
70
  $_count = $orderItemCollection->count();
71
+ $subtotal = 0;
72
  foreach ($orderItemCollection as $_item):
73
  if ($_item->getParentItem()) continue;
74
  ?>
75
  <tbody>
76
  <?php echo $this->getItemHtml($_item) ?>
77
  </tbody>
78
+ <?php $subtotal += (float)$_item->getRowTotal();?>
79
  <?php endforeach; ?>
80
+ <tfoot>
81
  <tr>
82
+ <td colspan="4" style="text-align: right;"><?php echo $this->__('Total') ?></td>
83
  <td style="text-align: right;">
84
+ <?php echo Mage::helper('core')->currency($subtotal, true, false);?>
85
  </td>
86
+ </tr>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
87
  </tfoot>
88
  </table>
89
  <div class="buttons-set">
app/design/frontend/base/default/template/marketplace/customer/account/shiporder.phtml CHANGED
@@ -30,7 +30,7 @@
30
  </dl>
31
  <p class="order-date"><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
32
  <?php if (!$_order->getIsVirtual()): ?>
33
- <form method="post" name="shipment" action="<?php echo $this->getBaseUrl()."marketplace/order/save"?>">
34
  <input type="hidden" name ="order_id" value="<?php echo $orderId?>" />
35
  <div class="col2-set order-info-box">
36
  <div class="col-1">
@@ -154,4 +154,11 @@
154
  </div>
155
  </div>
156
  </div>
157
- </form>
 
 
 
 
 
 
 
30
  </dl>
31
  <p class="order-date"><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
32
  <?php if (!$_order->getIsVirtual()): ?>
33
+ <form method="post" name="shipment" id="shipment" action="<?php echo $this->getBaseUrl()."marketplace/order/save"?>">
34
  <input type="hidden" name ="order_id" value="<?php echo $orderId?>" />
35
  <div class="col2-set order-info-box">
36
  <div class="col-1">
154
  </div>
155
  </div>
156
  </div>
157
+ </form>
158
+
159
+ <script type="text/javascript">
160
+ //<![CDATA[
161
+ var dataForm = new VarienForm('shipment', true);
162
+ //]]>
163
+ </script>
164
+
app/design/frontend/base/default/template/marketplace/customer/account/vieworder.phtml CHANGED
@@ -22,12 +22,25 @@
22
  $marketPlaceModel = Mage::getModel('marketplace/marketplace');
23
  $orderDetails = $marketPlaceModel->getOrderDetails($orderId);
24
  $seller_id = Mage::getSingleton('customer/session')->getId();
 
 
 
 
25
  ?>
 
26
  <?php $_order = Mage::getModel("sales/order")->load($orderId); ?>
27
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
28
  <div class="page-title title-buttons">
29
- <?php if($_order->getStatus() == 'processing') {?>
 
 
 
 
 
 
 
30
  <a href="<?php echo $this->getUrl('marketplace/order/ship',$arguement=array('order_id' => $orderId)) ?>" class="link-print" ><?php echo $this->__('Ship Order') ?></a>
 
31
  <?php }?>
32
  <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
33
  <a href="<?php echo $this->getUrl('marketplace/order/printorder',$arguement=array('order_id' => $orderId,'seller_id' => $seller_id)) ?>" class="link-print" onclick="this.target='_blank';"><?php echo $this->__('Print Order') ?></a>
@@ -89,61 +102,52 @@
89
  </div>
90
  <?php echo $this->getChildHtml('items');?>
91
 
92
- <?php if($_order->hasShipments())
93
- {
94
- $trackingData = $this->getShippingInfo($_order);
 
 
 
95
  ?>
96
- <div class="col2-set order-info-box">
 
97
  <div class="col-1" style="width:100% !important">
98
  <div class="box" >
99
  <div class="box-title">
100
  <h2><?php echo $this->__('Tracking Information') ?></h2>
101
  </div>
102
- <div class="box-content">
103
- <?php foreach($trackingData as $track): ?>
104
- <div style="float:left">
105
- <table class="tracking-table-popup data-table">
106
- <tbody>
107
- <tr>
108
- <th class="label"><?php echo $this->__('Tracking Number:'); ?></th>
109
- <td class="value"><?php echo $track->getNumber(); ?></td>
110
- </tr>
111
- <!--tr>
112
- <th class="label"><?php //echo $this->__('Carrier:'); ?></th>
113
- <td class="value"><?php //echo $track->getCarrierCode(); ?></td>
114
- </tr>
115
-
116
- <tr>
117
- <th class="label"><?php //echo $this->__('Title:'); ?></th>
118
- <td class="value"><?php //echo $track->getTitle() ?></td>
119
- </tr-->
120
- </tbody>
121
- </table>
122
- </div>
123
- <?php
124
- $comments = Mage::getResourceModel('sales/order_shipment_comment_collection')
125
- ->setShipmentFilter($track->getParentId())
126
- ?>
127
- <div style="float:right">
128
- <table class="tracking-table-popup data-table">
129
- <?php foreach($comments as $_comments): ?>
130
- <tbody>
131
  <tr>
132
- <th class="label"><?php echo $this->__('Comment:'); ?></th>
133
- <td class="value"><?php echo $_comments->getComment(); ?></td>
 
 
134
  </tr>
135
- <tr>
136
- <th class="label"><?php echo $this->__('Date:'); ?></th>
137
- <td class="value"><?php echo $_comments->getcreated_at(); ?></td>
138
- </tr>
139
- </tbody>
140
- <?php endforeach; ?>
141
- </table>
142
- </div>
143
- <?php endforeach; ?>
144
- </div>
 
 
 
 
 
 
 
 
145
  </div>
146
  </div>
147
  </div>
148
- <?php } ?>
149
  <?php echo $this->getChildHtml('selleroptions');?>
22
  $marketPlaceModel = Mage::getModel('marketplace/marketplace');
23
  $orderDetails = $marketPlaceModel->getOrderDetails($orderId);
24
  $seller_id = Mage::getSingleton('customer/session')->getId();
25
+
26
+ $orderModel = Mage::getModel('marketplace/order');
27
+ $orderModelObj = $orderModel->load($orderId);
28
+ $sellerOrderDetails = $orderModelObj->getOrderDetails($orderId);
29
  ?>
30
+
31
  <?php $_order = Mage::getModel("sales/order")->load($orderId); ?>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
  <div class="page-title title-buttons">
34
+ <?php $_enableShipOrderLink = false; ?>
35
+ <?php foreach($sellerOrderDetails as $_item): ?>
36
+ <?php if($_item->getQtyShipped() < $_item->getQtyOrdered()): ?>
37
+ <?php $_enableShipOrderLink = true; ?>
38
+ <?php endif; ?>
39
+ <?php endforeach; ?>
40
+
41
+ <?php if($_order->getStatus() == 'processing' && $_enableShipOrderLink == true) {?>
42
  <a href="<?php echo $this->getUrl('marketplace/order/ship',$arguement=array('order_id' => $orderId)) ?>" class="link-print" ><?php echo $this->__('Ship Order') ?></a>
43
+
44
  <?php }?>
45
  <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
46
  <a href="<?php echo $this->getUrl('marketplace/order/printorder',$arguement=array('order_id' => $orderId,'seller_id' => $seller_id)) ?>" class="link-print" onclick="this.target='_blank';"><?php echo $this->__('Print Order') ?></a>
102
  </div>
103
  <?php echo $this->getChildHtml('items');?>
104
 
105
+ <?php
106
+ $orderProducts = array(); // array of product id's which are presents in order
107
+ foreach($sellerOrderDetails as $_orderProducts)
108
+ {
109
+ $orderProducts[] = $_orderProducts->getProductId();
110
+ }
111
  ?>
112
+ <?php if($_order->hasShipments()): ?>
113
+ <div class="col2-set order-info-box" style="margin-top:15px !important">
114
  <div class="col-1" style="width:100% !important">
115
  <div class="box" >
116
  <div class="box-title">
117
  <h2><?php echo $this->__('Tracking Information') ?></h2>
118
  </div>
119
+ <table class="data-table" id="my-shipment-table">
120
+ <col width="1"/>
121
+ <col width="1" />
122
+ <col width="1" />
123
+ <col width="1" />
124
+ <thead>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
125
  <tr>
126
+ <th><?php echo $this->__('Carrier') ?></th>
127
+ <th><?php echo $this->__('Title') ?></th>
128
+ <th class="a-center"><?php echo $this->__('Tracking Number') ?></th>
129
+ <th class="a-center"><?php echo $this->__('Products') ?></th>
130
  </tr>
131
+ <?php foreach($_order->getShipmentsCollection() as $shipment): ?>
132
+ <tbody>
133
+ <?php foreach($shipment->getAllTracks() as $tracking_number): ?>
134
+ <?php foreach ($shipment->getAllItems() as $product): ?>
135
+ <?php if (in_array($product->getProductId(), $orderProducts)):?>
136
+ <tr>
137
+ <td><?php echo $tracking_number->getCarrierCode(); ?></td>
138
+ <td><?php echo $tracking_number->getTitle(); ?></td>
139
+ <td><?php echo $tracking_number->getNumber(); ?></td>
140
+ <td><?php echo $product->getName() . "<br/>"; ?> </td>
141
+ </tr>
142
+ <?php endif; ?>
143
+ <?php endforeach; ?>
144
+ <?php endforeach; ?>
145
+ </tbody>
146
+ <?php endforeach; ?>
147
+ </thead>
148
+ </table>
149
  </div>
150
  </div>
151
  </div>
152
+ <?php endif; ?>
153
  <?php echo $this->getChildHtml('selleroptions');?>
app/design/frontend/base/default/template/marketplace/customer/form/edit.phtml CHANGED
@@ -110,8 +110,7 @@
110
  <li>
111
  <label class="required"><?php echo $this->__('Company Description') ?></label>
112
  <div class="input-box">
113
- <textarea name="company_description" cols="40" id="company_description" title="<?php echo $this->__('Company Description') ?>"><?php echo $this->htmlEscape($this->getCustomer()->getCompanyDescription()) ?>
114
- </textarea>
115
  </div>
116
  </li>
117
  </ul>
110
  <li>
111
  <label class="required"><?php echo $this->__('Company Description') ?></label>
112
  <div class="input-box">
113
+ <textarea name="company_description" cols="40" id="company_description" title="<?php echo $this->__('Company Description')?>"><?php echo $this->htmlEscape($this->getCustomer()->getCompanyDescription())?></textarea>
 
114
  </div>
115
  </li>
116
  </ul>
app/design/frontend/base/default/template/marketplace/persistent/customer/form/register.phtml CHANGED
@@ -100,9 +100,7 @@
100
  <li>
101
  <label class="required"><?php echo $this->__('Company Description') ?></label>
102
  <div class="input-box">
103
- <textarea name="company_description" cols="40" id="company_description" title="<?php echo $this->__('Company Description') ?>">
104
- <?php echo $this->escapeHtml($this->getFormData()->getCompanyDescription()) ?>
105
- </textarea>
106
  </div>
107
  </li>
108
  </ul>
100
  <li>
101
  <label class="required"><?php echo $this->__('Company Description') ?></label>
102
  <div class="input-box">
103
+ <textarea name="company_description" cols="40" id="company_description" title="<?php echo $this->__('Company Description') ?>" class="required-entry"><?php echo $this->escapeHtml($this->getFormData()->getCompanyDescription()) ?></textarea>
 
 
104
  </div>
105
  </li>
106
  </ul>
app/design/frontend/base/default/template/marketplace/product/add.phtml CHANGED
@@ -38,6 +38,7 @@
38
  <?php $currentCategory = Mage::getModel("catalog/category")->load($cat->getEntityId()); ?>
39
  <option
40
  <?php
 
41
  if (in_array($currentCategory->getId(), $this->getFormData()->getCategoryIds())) {
42
  echo "selected=selected";
43
  }
@@ -94,7 +95,7 @@
94
  <div class="field">
95
  <label for="price" class="required"><em>*</em><?php echo $this->__('Price') ?></label>
96
  <div class="input-box">
97
- <input type="text" name="product[price]" id="price" value="<?php echo $this->getFormData()->getPrice(); ?>" title="<?php echo $this->__('Price') ?>" class="input-text required-entry" />
98
  </div>
99
  </div>
100
  </li>
@@ -102,13 +103,13 @@
102
  <div class="field">
103
  <label for="stock" class="required"><em>*</em><?php echo $this->__('Stock') ?></label>
104
  <div class="input-box">
105
- <input type="text" name="product[qty]" id="qty" value="<?php echo $this->getFormData()->getQty(); ?>" title="<?php echo $this->__('Stock') ?>" class="input-text required-entry" />
106
  </div>
107
  </div>
108
  <div class="field">
109
  <label for="weight" class="required"><em>*</em><?php echo $this->__('Weight') ?></label>
110
  <div class="input-box">
111
- <input type="text" name="product[weight]" id="weight" value="<?php echo $this->getFormData()->getWeight(); ?>" title="<?php echo $this->__('Weight') ?>" class="input-text required-entry" />
112
  </div>
113
  </div>
114
  </li>
38
  <?php $currentCategory = Mage::getModel("catalog/category")->load($cat->getEntityId()); ?>
39
  <option
40
  <?php
41
+ if(!is_null($this->getFormData()->getCategoryIds()))
42
  if (in_array($currentCategory->getId(), $this->getFormData()->getCategoryIds())) {
43
  echo "selected=selected";
44
  }
95
  <div class="field">
96
  <label for="price" class="required"><em>*</em><?php echo $this->__('Price') ?></label>
97
  <div class="input-box">
98
+ <input type="text" name="product[price]" id="price" value="<?php echo $this->getFormData()->getPrice(); ?>" title="<?php echo $this->__('Price') ?>" class="input-text required-entry validate-number" />
99
  </div>
100
  </div>
101
  </li>
103
  <div class="field">
104
  <label for="stock" class="required"><em>*</em><?php echo $this->__('Stock') ?></label>
105
  <div class="input-box">
106
+ <input type="text" name="product[qty]" id="qty" value="<?php echo $this->getFormData()->getQty(); ?>" title="<?php echo $this->__('Stock') ?>" class="input-text required-entry validate-number" />
107
  </div>
108
  </div>
109
  <div class="field">
110
  <label for="weight" class="required"><em>*</em><?php echo $this->__('Weight') ?></label>
111
  <div class="input-box">
112
+ <input type="text" name="product[weight]" id="weight" value="<?php echo $this->getFormData()->getWeight(); ?>" title="<?php echo $this->__('Weight') ?>" class="input-text required-entry validate-number" />
113
  </div>
114
  </div>
115
  </li>
app/design/frontend/base/default/template/marketplace/sales/myorder/items/renderer/ship/default.phtml CHANGED
@@ -182,7 +182,7 @@
182
  </span>
183
  </td>
184
  <td>
185
- <input type="text" value="<?php echo number_format($this->getItem()->getQtyOrdered(),0) ?>" name="shipment[items][<?php echo $order_id;?>]" class="input-text"></td>
186
  <td class="a-right">
187
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
188
  <span class="price-excl-tax">
@@ -296,12 +296,14 @@
296
  <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?></th>
297
  <?php endif; ?>
298
  -->
299
- <td>
300
  <?php
301
  $cnt = Mage::getModel("marketplace/buyerseller")->getActiveNotificationForOrder($order_id,$prod_id);
302
  if($cnt>0) {
303
- ?>
 
304
  <p><?php echo $cnt;?><?php echo $this->__('Notification(s)')?> <a href="<?php echo $this->getBaseUrl().'marketplace/buyerseller/reply/order/'.$order_id.'/product/'.$prod_id.'/'?>"><?php echo $this->__('Reply To Questions')?></a></p>
 
305
  <?php } ?>
306
- </td>
307
  </tr>
182
  </span>
183
  </td>
184
  <td>
185
+ <input type="text" value="<?php echo number_format($this->getItem()->getQtyOrdered(),0) ?>" name="shipment[items][<?php echo $this->getItem()->getId(); ?>]" class="input-text"></td>
186
  <td class="a-right">
187
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
188
  <span class="price-excl-tax">
296
  <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?></th>
297
  <?php endif; ?>
298
  -->
299
+
300
  <?php
301
  $cnt = Mage::getModel("marketplace/buyerseller")->getActiveNotificationForOrder($order_id,$prod_id);
302
  if($cnt>0) {
303
+ ?>
304
+ <td>
305
  <p><?php echo $cnt;?><?php echo $this->__('Notification(s)')?> <a href="<?php echo $this->getBaseUrl().'marketplace/buyerseller/reply/order/'.$order_id.'/product/'.$prod_id.'/'?>"><?php echo $this->__('Reply To Questions')?></a></p>
306
+ </td>
307
  <?php } ?>
308
+
309
  </tr>
app/design/frontend/base/default/template/marketplace/seller/info.phtml CHANGED
@@ -25,7 +25,7 @@
25
  </div>
26
  <div class="store-details">
27
  <div class="sub-heading"><h5><?php echo $this->__('About ').$seller['company_name']?></h5></div>
28
- <?php if($seller['company_banner']):?>
29
  <div class="company-banner">
30
  <img src="<?php echo $seller['company_banner']?>" width="<?php echo Mage::getStoreConfig('marketplace/marketplace/default_width').'px'?>" height="<?php echo Mage::getStoreConfig('marketplace/marketplace/default_height').'px'?>" />
31
  </div>
25
  </div>
26
  <div class="store-details">
27
  <div class="sub-heading"><h5><?php echo $this->__('About ').$seller['company_name']?></h5></div>
28
+ <?php if(!empty($seller['company_banner'])):?>
29
  <div class="company-banner">
30
  <img src="<?php echo $seller['company_banner']?>" width="<?php echo Mage::getStoreConfig('marketplace/marketplace/default_width').'px'?>" height="<?php echo Mage::getStoreConfig('marketplace/marketplace/default_height').'px'?>" />
31
  </div>
app/design/frontend/base/default/template/marketplace/seller/logo.phtml CHANGED
@@ -20,8 +20,8 @@
20
 
21
  $seller = $this->getSellerData();
22
  ?>
23
- <?php if ($seller['company_logo']):?>
24
  <div class="customer-logo">
25
- <img src="<?php echo Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA)."/".$seller['company_logo']?>" width ="195px" height="225px"/>
26
  </div>
27
  <?php endif;?>
20
 
21
  $seller = $this->getSellerData();
22
  ?>
23
+ <?php if (!empty($seller['company_logo'])):?>
24
  <div class="customer-logo">
25
+ <img src="<?php echo $seller['company_logo'];?>" width ="195px" height="225px"/>
26
  </div>
27
  <?php endif;?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Cybage_Marketplace</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License</license>
7
  <channel>community</channel>
@@ -26,12 +26,13 @@ Admin&#xD;
26
  &#x2022; Configure the Marketplace plug-in on Magento&#xD;
27
  &#x2022; Approve sellers &#xD;
28
  &#x2022; Set categories for Marketplace&#xD;
29
- &#x2022; Generate reports: Seller orders and seller payments</description>
 
30
  <notes>After installation of the Marketplace plug-in, please clear the cache.</notes>
31
  <authors><author><name>Cybage Software Pvt. Ltd.</name><user>cybage</user><email>Support_Magento@cybage.com</email></author></authors>
32
- <date>2014-06-13</date>
33
- <time>18:36:29</time>
34
- <contents><target name="magecommunity"><dir name="Cybage"><dir name="Marketplace"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><file name="Grid.php" hash="f25721e6c81c11873ef44bf8ede6fccf"/></dir></dir><dir name="Commission"><dir name="Edit"><file name="Form.php" hash="1f957bafc5767783d859db1d2fe1e9cb"/><dir name="Tab"><file name="Form.php" hash="8ff027c410ca41a590b7bd03b982f28d"/><file name="Payhistory.php" hash="d46191b0cb444a341570b744ffeef8b7"/></dir><file name="Tabs.php" hash="ff3117562f338306956e6d873865d122"/></dir><file name="Edit.php" hash="2f7d6f24cc09403347bf644548ebad3b"/><file name="Grid.php" hash="14a97b7f3446998808935ae8392cd5c7"/></dir><file name="Commission.php" hash="e9fe70755eb546a502df43729de27bc0"/><dir name="Orderby"><file name="Form.php" hash="65cf80ea8f270ad26ebbaee75dfca9aa"/><dir name="Grid"><file name="Abstract.php" hash="d050be8b9179b134146bf824cc1617b3"/><file name="Name.php" hash="8566afb8fb98cb97001aa2633268de61"/></dir><file name="Grid.php" hash="81da75eaa732dffb080d9ffe81a4b70f"/></dir><file name="Orderby.php" hash="aec4ca4b5b170acc710166756ece6ca7"/><dir name="Seller"><dir name="Edit"><file name="Form.php" hash="8d26f7808027804638f72510142b2482"/><dir name="Tab"><file name="Form.php" hash="6a336dccd50b877ed6cb3d3ab88d6901"/></dir><file name="Tabs.php" hash="45ffef715b5546c532536e8c5781c52c"/></dir><file name="Edit.php" hash="f2504dc4db5161b6a5e61a822c5e75a0"/><file name="Grid.php" hash="41e49f6c0204dd261f1ded1002c9d1fa"/></dir><file name="Seller.php" hash="daef40b01e64399278bbbacd0ef1f432"/><dir name="Widget"><dir name="Column"><dir name="Renderer"><file name="Paylink.php" hash="0d34ec8d86b240441c3bcdaf3b6b20b6"/></dir></dir></dir></dir><dir name="Buyerseller"><dir name="Sales"><dir name="Order"><file name="History.php" hash="2cb2d7ae9ca0f4cd5a6ea31b84b14bf2"/></dir></dir></dir><file name="Buyerseller.php" hash="217b92c8ec9045fa17741b3c16e924e4"/><dir name="Catalog"><dir name="Product"><file name="List.php" hash="ec2bc63330fbd3eab216722a3b3a212e"/><file name="View.php" hash="31fd9b89972ca0e23eb6bf65adbe2f91"/></dir></dir><dir name="Myorders"><file name="Selleroptions.php" hash="809bb905b251e1fa8c87df4a53cc5a06"/><file name="View.php" hash="334b9fbde48d3a8c72e49d51987cecf1"/></dir><file name="Myorders.php" hash="b356cc51ecc7ca535d73116c913a53fa"/><dir name="Order"><dir name="Item"><dir name="Renderer"><file name="Default.php" hash="625af04c6df38d91f8c8a41a077c6ca3"/></dir></dir><file name="Selleroptions.php" hash="a737136d77b4118411d8728e6242ce07"/><file name="View.php" hash="ef710f34790643dc3aada538d6c95c7e"/></dir><dir name="Product"><dir name="Askquestion"><file name="Link.php" hash="72b665a7744beb6fa23f070d064913cc"/><file name="Myquestions.php" hash="18e12d38a1635a2f8a62249186c32b13"/><file name="Productquestions.php" hash="2a8948af0c03cbee3f5f6dd8b1283d36"/><file name="Replyform.php" hash="e28c5f99cba7d20af07bbde533c5596c"/></dir></dir><file name="Product.php" hash="014b3707d9f934741e8e6362d3d96195"/><dir name="Review"><dir name="Product"><dir name="View"><file name="List.php" hash="0d9791547dfce363fcd9df897697c58b"/></dir><file name="View.php" hash="1d55db853157c9d99696ddf878ab158d"/></dir></dir><dir name="Sales"><dir name="Order"><file name="History.php" hash="dd002fbaea06e26a9423b604681e78f5"/></dir></dir><dir name="Seller"><file name="Info.php" hash="2d33eba36b069bf277d267df6df36d32"/></dir></dir><dir name="Controller"><file name="Router.php" hash="758ff31abf12426b26c3aecc5b4c137f"/></dir><dir name="Helper"><file name="Data.php" hash="a4556eb92036d9bd80a0c9093e08179e"/></dir><dir name="Model"><file name="Buyerseller.php" hash="06907bf5b0f55381bfdb8f6838f810d2"/><file name="Commission.php" hash="85964e3aef73f49d8c8a747b0a4a566f"/><file name="Customatributestatus.php" hash="5d2beafdbcb372eb3121f7719ee12619"/><file name="Customer.php" hash="1bae3ab500041cff629ffbc1997737ac"/><file name="Image.php" hash="fcf0be7f58f6511fde2c118a8d4ea597"/><file name="Logging.php" hash="bf8622cce3d8e2d0fb17567556c4738e"/><file name="Marketplace.php" hash="ba2fd4ff8f1ad92eb97b421ea9b3dfea"/><file name="Observer.php" hash="12d1711256c7a0aecd8db133e124c966"/><file name="Order.php" hash="72ef039c78491f2eecac02a23d1890cf"/><dir name="Product"><file name="Action.php" hash="6cc115390b3c2dea31d815734fdbd877"/></dir><file name="Question.php" hash="70c5328aaa0000e47da324224b0bcfc7"/><file name="Reply.php" hash="f5120fa047fee4c6309f9fd6134e0a66"/><dir name="Resource"><dir name="Buyerseller"><file name="Collection.php" hash="171123b4b345c8797d32656d5b10b0f4"/></dir><file name="Buyerseller.php" hash="af96d782600d62e16c0414b3e7b6b77c"/><dir name="Commission"><file name="Collection.php" hash="8831b90ceeba929aba53678661f1a4d0"/></dir><file name="Commission.php" hash="6174e0aa3de188e08e64c3eac8d30aae"/><file name="Customer.php" hash="d7eec6f62d2fe8df426e05a86fe3c87b"/><file name="Logging.php" hash="236c0ed167e1a51587c3c646cc87035b"/><dir name="Orderby"><file name="Collection.php" hash="b95af010b544db77453899f2c35fbc93"/></dir><dir name="Question"><file name="Collection.php" hash="ceaa1c3157d23db44b21367a07d29e2f"/></dir><file name="Question.php" hash="3b7da7902de11b74fd89a1c60ec3123a"/><dir name="Reply"><file name="Collection.php" hash="7f3d5dc190082a5464968f01133dc7fe"/></dir><file name="Reply.php" hash="a805231e4378b46ff6411590ad97f73c"/></dir><dir name="Seller"><dir name="Attribute"><dir name="Source"><dir name="Product"><file name="State.php" hash="f509894d6b3dc464d336231f0d029e4f"/><file name="Status.php" hash="ef3d748a92c4f9e779a96c27c54323a8"/></dir></dir></dir></dir><file name="Selleroptions.php" hash="988809c7376316bc220ca61ad6fdac6b"/><file name="Session.php" hash="fbaed1c6fe6b81e52ff52908144ed85f"/><dir name="Source"><file name="Option.php" hash="ceb28daee1e7b9b06c8c97286ceef513"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Product"><file name="State.php" hash="a459bf4e69b6e0cc8f9541879416a67c"/><file name="Status.php" hash="4885e5c457b55db3e77a9986901003bd"/><file name="Visibility.php" hash="920e27fdced9b2a1e104cf03b4ec9a21"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="AccountController.php" hash="3c52ac83e901eecfa701beef0d539fbc"/><dir name="Adminhtml"><dir name="Catalog"><file name="ProductController.php" hash="f104170160b914b2e0294e3adb4111b6"/></dir><file name="CommissionController.php" hash="76cb41bff619281f41a9b813fffbd491"/><file name="OrderbyController.php" hash="2d0f4ceec5edd61d71da1d58edd6258c"/><file name="SellerController.php" hash="dffe7c1f7465f0b13b0c6eab21dc2625"/></dir><file name="BuyersellerController.php" hash="1a48a933f0a2a793bf2b4fd3d6dce450"/><file name="DashboardController.php" hash="75715494f2f9c98586dc1207c1d1eb77"/><file name="OrderController.php" hash="9df4e21f147009f9385b4c1ac86acf72"/><file name="ProductController.php" hash="ce61ece09aa10d8eb422343250fc395e"/><file name="ProductquestionController.php" hash="a19c97e9f32009f0de3378c5c88c91ab"/><file name="SellerController.php" hash="d09843f2530b04beb4de6dda9fc9f913"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a22533c081f75a33107bf413a5c126d2"/><file name="config.xml" hash="21ccf276778b2826e5ea71795abb599c"/><file name="system.xml" hash="c57321b1080cf5173c4abf84aa7089f7"/></dir><dir name="sql"><dir name="marketplace_setup"><file name="mysql4-install-0.1.0.php" hash="ea04496ea153372066413f594956d036"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="a6e712b4022636be2e6151d9e94303da"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="c930ac0f1591306c00a164f27e5fe465"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="9e212704951bf888dc2839c3802a4e6b"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="4e10d00e95f99efd9bdb4861770470f2"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="f3edd8e5643e3b46cc1793f0ceb0e02e"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="ea02b85b9dccde25899e4da9a1855e88"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="marketplace.xml" hash="f3ef021f0d374ff7cdd9d8871acaeca5"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="marketplace.xml" hash="d102088dd679a3935f1f3f1a770193a3"/></dir><dir name="template"><dir name="marketplace"><dir name="buyerseller"><file name="notify.phtml" hash="5b8972392844f0eee4c1cea3dade7a5b"/><file name="reply.phtml" hash="1bb6802be4b15c643f669cc2e93a5fc6"/><dir name="sales"><dir name="order"><file name="history.phtml" hash="e388f18c4e7ec27fa353a1761cf41494"/></dir></dir></dir><dir name="catalog"><dir name="product"><dir name="askquestion"><file name="form.phtml" hash="9e35a0dc033b0862c4f902568001598b"/><file name="link.phtml" hash="fe3de6946afa9f678786204ef6d9db29"/><file name="myquestions.phtml" hash="c466cd90d4151602ab3584d66cfcf0cd"/><file name="productquestions.phtml" hash="049c183e424e7898f4591f6720812409"/><file name="reply_form.phtml" hash="a57fb90ed343e54f10ddfae954bdb242"/></dir><dir name="view"><file name="sellerinfo.phtml" hash="a7f48203c66bca6989ea63a8f84dce44"/></dir><file name="view.phtml" hash="e0a332aaf00bf9d9bf5f26b412cd44e2"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="26da86d5981c83c4a029778b532eba34"/></dir></dir><dir name="multishipping"><dir name="item"><file name="default.phtml" hash="74ca10032cb2292f2a03c43d86815720"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="ad81267ad4a3f2ce54d273d4f4682e5d"/></dir></dir></dir><dir name="customer"><dir name="account"><dir name="myorders"><file name="items.phtml" hash="196d4801ccf3ecb8029bda3f331c1243"/><file name="shipitems.phtml" hash="6dae69b37e69e45c6f585f5f75502964"/></dir><file name="navigation.phtml" hash="2089d2c11c17fd4e20a395a3e36e453b"/><file name="print.phtml" hash="c1dad6031ce6703bfbfc8a4ff9194120"/><file name="selleroptions.phtml" hash="12242dc9e8a0fb537dbe2b96ed29d494"/><file name="shiporder.phtml" hash="bb391f6798bab85bba8780bf7f634a47"/><file name="vieworder.phtml" hash="69d2e1c041bf6d8db7fb744e8bce91cb"/></dir><dir name="form"><file name="edit.phtml" hash="2216870784f292873d25636253d344e0"/></dir></dir><dir name="dashboard"><file name="bestseller.phtml" hash="87352d5b3a90761aa26cb3ee6a0ea04e"/><file name="dashboard.phtml" hash="e3b228c43357fb121c920185fe837434"/><file name="myorders.phtml" hash="d6863530100ff501090f08407c104a1f"/><file name="notificationcount.phtml" hash="2253183ccf44910b769552c4427eab90"/><file name="questioncount.phtml" hash="a0c237a252be2264ec3c966106798771"/></dir><dir name="persistent"><dir name="customer"><dir name="form"><file name="register.phtml" hash="ffc7b0f318ae41515446d30928f50195"/></dir></dir></dir><dir name="product"><file name="add.phtml" hash="0923a8bbb0c1238eb7db33f43d20c889"/><file name="edit.phtml" hash="6cb3278a52abcc9fc4bc90440c319d3b"/><file name="grid.phtml" hash="fe28b864ce6c469dfa8e190da8357e43"/><file name="import.phtml" hash="3a923be5fea4d0f6eddd3b25e0cff1cc"/></dir><dir name="review"><dir name="product"><dir name="view"><file name="list.phtml" hash="b9d8091752efa906328a4a3f0a21e847"/></dir></dir></dir><dir name="sales"><dir name="myorder"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="b61198dff58c6a5aa3e5e46578c0cbbe"/><dir name="ship"><file name="default.phtml" hash="0a0f509431c4a903ee060cacb3a43353"/></dir></dir></dir></dir><dir name="order"><file name="form.phtml" hash="71772f95673836ad608deacf58bdaf34"/><file name="history.phtml" hash="25427e4315e98427065bf3edc82217ef"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="8a7556035d32a504f270498c1d9e1aa3"/></dir></dir><file name="items.phtml" hash="2b0a0054f065f420ce8bdc24433ab94e"/></dir><file name="print.phtml" hash="50f7d2ff531b61a678a4d65123fbae91"/><file name="selleroptions.phtml" hash="389508e5804161be886069959a8770f2"/><file name="vieworder.phtml" hash="ef9810ecf4160961d139d9dab847a9b0"/></dir><dir name="seller"><dir name="account"><file name="myorders.phtml" hash="51696ea86d20d3306b2ef8be2fb5e8b0"/></dir><file name="info.phtml" hash="be6fb550752965d8bc44469acf92e75d"/><file name="logo.phtml" hash="e5755bd0399be0f3b16cfe8725e4341f"/><file name="ratings.phtml" hash="885779d8e85ff3fb8e3f1fe50cd18c7d"/><file name="seller_ratings.phtml" hash="7307d70ae60465825fc2a31fe9b2d4ad"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Cybage_Marketplace.xml" hash="655674c415c4a30754d292b1b585f959"/></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><file name="newseller_account.html" hash="298a277968587aa17dab9571d37f1116"/><file name="pendingorder_reminder.html" hash="7698d6a043afb5d2a52571a8e373b968"/><file name="seller_payment.html" hash="1b6350fdebfe1b496d03a164f616d415"/><file name="seller_status.html" hash="8b01d0a683d8fe1d4774fc32cdfb09a7"/><dir name="sales"><file name="customer_cancelled_new.html" hash="cbfe7cfa8307995aff1d35cadb62b910"/><file name="customer_completed_new.html" hash="afd8b01955854d0235aaa4e94a41dc87"/><file name="customer_processing_new.html" hash="3521f931be71816a0a6bc81d56d0961f"/><file name="product_comment.html" hash="e251a719323814263e9f84b12601b892"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="jquery"><file name="jquery-1.9.1.min.js" hash="993baffc269ef5414ec40f3d2de19294"/></dir><dir name="marketplace"><dir name="fancybox"><file name="jquery-1.7.2.min.js" hash="09bf7cb5fd333ee8c1c6be7475f85026"/><file name="jquery.fancybox-1.3.4.pack.js" hash="0b714d85fd5a4fe7625801f8d6e7ad57"/><file name="jquery.mousewheel-3.0.4.pack.js" hash="8ed7eaa3ff4d601639bfc1d594713957"/><file name="jquery.noconflict.js" hash="3179f2255b046d5f2e9a71e365287bef"/></dir><file name="nicEdit-latest.js.js" hash="46134bdf90c2e6279bb5efe7874a0ebc"/></dir></dir></target><target name="magemedia"><dir name="marketplace"><file name="productimport.csv" hash="7b0c8a1c0d5392371a49bda7badc1298"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="marketplace"><file name="jquery.fancybox-1.3.4.css" hash="0233ba7e3d8418cebf47fc9983f65e60"/><file name="styles.css" hash="30d9bc46cec97d7627b3fce3e595c009"/></dir></dir><dir name="images"><dir name="marketplace"><dir name="fancybox"><file name="blank.gif" hash="325472601571f31e1bf00674c368d335"/><file name="fancy_close.png" hash="6e2879a324a76e9972ebc98201aae1d8"/><file name="fancy_loading.png" hash="b1d54c240cf06e7f41e372d56919b738"/><file name="fancy_nav_left.png" hash="3f3e406102152cd8236383568a40ba35"/><file name="fancy_nav_right.png" hash="216e4bde5bddeeaa60dc3d692890a68e"/><file name="fancy_shadow_e.png" hash="fd4f491080d29fade5080877f1ba4c8b"/><file name="fancy_shadow_n.png" hash="18cde16379b2ceadef714d9b346d09ec"/><file name="fancy_shadow_ne.png" hash="63adf788acf193d4e4f3642d7d793125"/><file name="fancy_shadow_nw.png" hash="c820c878aedb7a7f9ebd7135a58e7c65"/><file name="fancy_shadow_s.png" hash="9b9e5c888028aaef40fe5b6a363f1e29"/><file name="fancy_shadow_se.png" hash="a8afd5a008884380ee712d177105268f"/><file name="fancy_shadow_sw.png" hash="f81cc0fee5581d76ad3cebe47e7e791b"/><file name="fancy_shadow_w.png" hash="59b0e63eb059e58d932cfd53da4d87e6"/><file name="fancy_title_left.png" hash="1582ac2d3bef6a6445bf02ceca2741cd"/><file name="fancy_title_main.png" hash="38dad6c1ed4bdc81c0bec721b2deb8c2"/><file name="fancy_title_over.png" hash="b886fd165d4b7ac77d41fb52d87ffc60"/><file name="fancy_title_right.png" hash="6cbe0c935511e7f9a2555ccb6a7324c4"/><file name="fancybox-x.png" hash="168696d8a694214090ef90e029cdf393"/><file name="fancybox-y.png" hash="36a58859beb9a6b19322a37466b9f78e"/><file name="fancybox.png" hash="11e57e492ee0311540967cc7a1e6e3e2"/></dir><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/></dir></dir></dir></dir></dir></target></contents>
35
  <compatible/>
36
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
37
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Cybage_Marketplace</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License</license>
7
  <channel>community</channel>
26
  &#x2022; Configure the Marketplace plug-in on Magento&#xD;
27
  &#x2022; Approve sellers &#xD;
28
  &#x2022; Set categories for Marketplace&#xD;
29
+ &#x2022; Generate reports: Seller orders and seller payments&#xD;
30
+ </description>
31
  <notes>After installation of the Marketplace plug-in, please clear the cache.</notes>
32
  <authors><author><name>Cybage Software Pvt. Ltd.</name><user>cybage</user><email>Support_Magento@cybage.com</email></author></authors>
33
+ <date>2014-08-14</date>
34
+ <time>17:09:37</time>
35
+ <contents><target name="magecommunity"><dir name="Cybage"><dir name="Marketplace"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><file name="Grid.php" hash="f25721e6c81c11873ef44bf8ede6fccf"/></dir></dir><dir name="Commission"><dir name="Edit"><file name="Form.php" hash="1f957bafc5767783d859db1d2fe1e9cb"/><dir name="Tab"><file name="Form.php" hash="8ff027c410ca41a590b7bd03b982f28d"/><file name="Payhistory.php" hash="d46191b0cb444a341570b744ffeef8b7"/></dir><file name="Tabs.php" hash="ff3117562f338306956e6d873865d122"/></dir><file name="Edit.php" hash="2f7d6f24cc09403347bf644548ebad3b"/><file name="Grid.php" hash="14a97b7f3446998808935ae8392cd5c7"/></dir><file name="Commission.php" hash="e9fe70755eb546a502df43729de27bc0"/><dir name="Orderby"><file name="Form.php" hash="65cf80ea8f270ad26ebbaee75dfca9aa"/><dir name="Grid"><file name="Abstract.php" hash="d050be8b9179b134146bf824cc1617b3"/><file name="Name.php" hash="8566afb8fb98cb97001aa2633268de61"/></dir><file name="Grid.php" hash="81da75eaa732dffb080d9ffe81a4b70f"/></dir><file name="Orderby.php" hash="aec4ca4b5b170acc710166756ece6ca7"/><dir name="Seller"><dir name="Edit"><file name="Form.php" hash="8d26f7808027804638f72510142b2482"/><dir name="Tab"><file name="Form.php" hash="6a336dccd50b877ed6cb3d3ab88d6901"/></dir><file name="Tabs.php" hash="45ffef715b5546c532536e8c5781c52c"/></dir><file name="Edit.php" hash="f2504dc4db5161b6a5e61a822c5e75a0"/><file name="Grid.php" hash="59aca20e6f773bfc0315b85d65b1cc57"/></dir><file name="Seller.php" hash="daef40b01e64399278bbbacd0ef1f432"/><dir name="Widget"><dir name="Column"><dir name="Renderer"><file name="Paylink.php" hash="0d34ec8d86b240441c3bcdaf3b6b20b6"/></dir></dir></dir></dir><dir name="Buyerseller"><dir name="Sales"><dir name="Order"><file name="History.php" hash="2cb2d7ae9ca0f4cd5a6ea31b84b14bf2"/></dir></dir></dir><file name="Buyerseller.php" hash="217b92c8ec9045fa17741b3c16e924e4"/><dir name="Catalog"><dir name="Product"><file name="List.php" hash="85d9aad6bd14c934d012b9c15af14949"/><file name="View.php" hash="31fd9b89972ca0e23eb6bf65adbe2f91"/></dir></dir><dir name="Myorders"><file name="Selleroptions.php" hash="809bb905b251e1fa8c87df4a53cc5a06"/><file name="View.php" hash="334b9fbde48d3a8c72e49d51987cecf1"/></dir><file name="Myorders.php" hash="b356cc51ecc7ca535d73116c913a53fa"/><dir name="Order"><dir name="Item"><dir name="Renderer"><file name="Default.php" hash="625af04c6df38d91f8c8a41a077c6ca3"/></dir></dir><file name="Selleroptions.php" hash="a737136d77b4118411d8728e6242ce07"/><file name="View.php" hash="ef710f34790643dc3aada538d6c95c7e"/></dir><dir name="Product"><dir name="Askquestion"><file name="Link.php" hash="72b665a7744beb6fa23f070d064913cc"/><file name="Myquestions.php" hash="18e12d38a1635a2f8a62249186c32b13"/><file name="Productquestions.php" hash="2a8948af0c03cbee3f5f6dd8b1283d36"/><file name="Replyform.php" hash="e28c5f99cba7d20af07bbde533c5596c"/></dir></dir><file name="Product.php" hash="014b3707d9f934741e8e6362d3d96195"/><dir name="Review"><dir name="Product"><dir name="View"><file name="List.php" hash="0d9791547dfce363fcd9df897697c58b"/></dir><file name="View.php" hash="1d55db853157c9d99696ddf878ab158d"/></dir></dir><dir name="Sales"><dir name="Order"><file name="History.php" hash="dd002fbaea06e26a9423b604681e78f5"/></dir></dir><dir name="Seller"><file name="Info.php" hash="2d33eba36b069bf277d267df6df36d32"/></dir></dir><dir name="Controller"><file name="Router.php" hash="758ff31abf12426b26c3aecc5b4c137f"/></dir><dir name="Helper"><file name="Data.php" hash="3ef853fe5ff8c45dd23ce72f617ed960"/></dir><dir name="Model"><file name="Buyerseller.php" hash="65889d5640b272ea8903e6e72c673876"/><file name="Commission.php" hash="85964e3aef73f49d8c8a747b0a4a566f"/><file name="Customatributestatus.php" hash="5d2beafdbcb372eb3121f7719ee12619"/><file name="Customer.php" hash="1bae3ab500041cff629ffbc1997737ac"/><file name="Image.php" hash="fcf0be7f58f6511fde2c118a8d4ea597"/><file name="Logging.php" hash="bf8622cce3d8e2d0fb17567556c4738e"/><file name="Marketplace.php" hash="0eba385172a3d3d9dcde1a3efdd235c6"/><file name="Observer.php" hash="5a38202d042a01b63bdcc1f4758d7bd8"/><file name="Order.php" hash="72ef039c78491f2eecac02a23d1890cf"/><dir name="Product"><file name="Action.php" hash="6cc115390b3c2dea31d815734fdbd877"/></dir><file name="Question.php" hash="70c5328aaa0000e47da324224b0bcfc7"/><file name="Reply.php" hash="f5120fa047fee4c6309f9fd6134e0a66"/><dir name="Resource"><dir name="Buyerseller"><file name="Collection.php" hash="171123b4b345c8797d32656d5b10b0f4"/></dir><file name="Buyerseller.php" hash="af96d782600d62e16c0414b3e7b6b77c"/><dir name="Commission"><file name="Collection.php" hash="8831b90ceeba929aba53678661f1a4d0"/></dir><file name="Commission.php" hash="6174e0aa3de188e08e64c3eac8d30aae"/><file name="Customer.php" hash="45726623813cc70254646741675b4eb9"/><file name="Logging.php" hash="236c0ed167e1a51587c3c646cc87035b"/><dir name="Orderby"><file name="Collection.php" hash="7616308efd7933d580fe55d39a0bec11"/></dir><dir name="Question"><file name="Collection.php" hash="ceaa1c3157d23db44b21367a07d29e2f"/></dir><file name="Question.php" hash="3b7da7902de11b74fd89a1c60ec3123a"/><dir name="Reply"><file name="Collection.php" hash="7f3d5dc190082a5464968f01133dc7fe"/></dir><file name="Reply.php" hash="a805231e4378b46ff6411590ad97f73c"/></dir><dir name="Seller"><dir name="Attribute"><dir name="Source"><dir name="Product"><file name="State.php" hash="f509894d6b3dc464d336231f0d029e4f"/><file name="Status.php" hash="ef3d748a92c4f9e779a96c27c54323a8"/></dir></dir></dir></dir><file name="Selleroptions.php" hash="bd2d442431a6954b2cb4405647102706"/><file name="Session.php" hash="fbaed1c6fe6b81e52ff52908144ed85f"/><dir name="Source"><file name="Option.php" hash="ceb28daee1e7b9b06c8c97286ceef513"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Product"><file name="State.php" hash="a459bf4e69b6e0cc8f9541879416a67c"/><file name="Status.php" hash="4885e5c457b55db3e77a9986901003bd"/><file name="Visibility.php" hash="920e27fdced9b2a1e104cf03b4ec9a21"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="AccountController.php" hash="398b86eaa3ac443fd388c540b9f7c0d0"/><dir name="Adminhtml"><dir name="Catalog"><file name="ProductController.php" hash="f104170160b914b2e0294e3adb4111b6"/></dir><file name="CommissionController.php" hash="76cb41bff619281f41a9b813fffbd491"/><file name="OrderbyController.php" hash="2d0f4ceec5edd61d71da1d58edd6258c"/><file name="SellerController.php" hash="dffe7c1f7465f0b13b0c6eab21dc2625"/></dir><file name="BuyersellerController.php" hash="1a48a933f0a2a793bf2b4fd3d6dce450"/><file name="DashboardController.php" hash="75715494f2f9c98586dc1207c1d1eb77"/><file name="OrderController.php" hash="d379e16fae6be8d3fc0f5ce303058f32"/><file name="ProductController.php" hash="94ea1da0110c934ddcd1d82c22a0f6e3"/><file name="ProductquestionController.php" hash="a19c97e9f32009f0de3378c5c88c91ab"/><file name="SellerController.php" hash="d09843f2530b04beb4de6dda9fc9f913"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a22533c081f75a33107bf413a5c126d2"/><file name="config.xml" hash="4b4fb31c47e1ed2ec9b2b87499c6274f"/><file name="system.xml" hash="c57321b1080cf5173c4abf84aa7089f7"/></dir><dir name="sql"><dir name="marketplace_setup"><file name="mysql4-install-0.1.0.php" hash="ea04496ea153372066413f594956d036"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="a6e712b4022636be2e6151d9e94303da"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="87080b7cd660843c265bf1fb08a73a1b"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="79f6a5e2651866c042f0d1f2c2dc2890"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="4e10d00e95f99efd9bdb4861770470f2"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="f3edd8e5643e3b46cc1793f0ceb0e02e"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="ea02b85b9dccde25899e4da9a1855e88"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="80220174c7af6eaf05f6a26683627e58"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="marketplace.xml" hash="f3ef021f0d374ff7cdd9d8871acaeca5"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="marketplace.xml" hash="d102088dd679a3935f1f3f1a770193a3"/></dir><dir name="template"><dir name="marketplace"><dir name="buyerseller"><file name="notify.phtml" hash="5b8972392844f0eee4c1cea3dade7a5b"/><file name="reply.phtml" hash="1bb6802be4b15c643f669cc2e93a5fc6"/><dir name="sales"><dir name="order"><file name="history.phtml" hash="e388f18c4e7ec27fa353a1761cf41494"/></dir></dir></dir><dir name="catalog"><dir name="product"><dir name="askquestion"><file name="form.phtml" hash="9e35a0dc033b0862c4f902568001598b"/><file name="link.phtml" hash="fe3de6946afa9f678786204ef6d9db29"/><file name="myquestions.phtml" hash="c466cd90d4151602ab3584d66cfcf0cd"/><file name="productquestions.phtml" hash="049c183e424e7898f4591f6720812409"/><file name="reply_form.phtml" hash="a57fb90ed343e54f10ddfae954bdb242"/></dir><dir name="view"><file name="sellerinfo.phtml" hash="a7f48203c66bca6989ea63a8f84dce44"/></dir><file name="view.phtml" hash="e0a332aaf00bf9d9bf5f26b412cd44e2"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="26da86d5981c83c4a029778b532eba34"/></dir></dir><dir name="multishipping"><dir name="item"><file name="default.phtml" hash="74ca10032cb2292f2a03c43d86815720"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="ad81267ad4a3f2ce54d273d4f4682e5d"/></dir></dir></dir><dir name="customer"><dir name="account"><dir name="myorders"><file name="items.phtml" hash="7fb93dbb348df08f221660ca5dcbea67"/><file name="shipitems.phtml" hash="f14bd6e96cb1c0b28af018e3843dc785"/></dir><file name="navigation.phtml" hash="2089d2c11c17fd4e20a395a3e36e453b"/><file name="print.phtml" hash="5e596742e04763ce01674f4cb2df0f8d"/><file name="selleroptions.phtml" hash="12242dc9e8a0fb537dbe2b96ed29d494"/><file name="shiporder.phtml" hash="0f02907cc7a735bfee00895aaa66e562"/><file name="vieworder.phtml" hash="aa2f965823e32103a54160fc982dfbaa"/></dir><dir name="form"><file name="edit.phtml" hash="b3a2a720798e1b25ae4f2413898ebc00"/></dir></dir><dir name="dashboard"><file name="bestseller.phtml" hash="87352d5b3a90761aa26cb3ee6a0ea04e"/><file name="dashboard.phtml" hash="e3b228c43357fb121c920185fe837434"/><file name="myorders.phtml" hash="d6863530100ff501090f08407c104a1f"/><file name="notificationcount.phtml" hash="2253183ccf44910b769552c4427eab90"/><file name="questioncount.phtml" hash="a0c237a252be2264ec3c966106798771"/></dir><dir name="persistent"><dir name="customer"><dir name="form"><file name="register.phtml" hash="943ffb36cc48c8c46393ed6d867d0ad7"/></dir></dir></dir><dir name="product"><file name="add.phtml" hash="ef3bc3d6cdd3e427e41971414d9d405d"/><file name="edit.phtml" hash="6cb3278a52abcc9fc4bc90440c319d3b"/><file name="grid.phtml" hash="fe28b864ce6c469dfa8e190da8357e43"/><file name="import.phtml" hash="3a923be5fea4d0f6eddd3b25e0cff1cc"/></dir><dir name="review"><dir name="product"><dir name="view"><file name="list.phtml" hash="b9d8091752efa906328a4a3f0a21e847"/></dir></dir></dir><dir name="sales"><dir name="myorder"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="b61198dff58c6a5aa3e5e46578c0cbbe"/><dir name="ship"><file name="default.phtml" hash="6c58361fff7b14e6f573287eccc28f04"/></dir></dir></dir></dir><dir name="order"><file name="form.phtml" hash="71772f95673836ad608deacf58bdaf34"/><file name="history.phtml" hash="25427e4315e98427065bf3edc82217ef"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="8a7556035d32a504f270498c1d9e1aa3"/></dir></dir><file name="items.phtml" hash="2b0a0054f065f420ce8bdc24433ab94e"/></dir><file name="print.phtml" hash="50f7d2ff531b61a678a4d65123fbae91"/><file name="selleroptions.phtml" hash="389508e5804161be886069959a8770f2"/><file name="vieworder.phtml" hash="ef9810ecf4160961d139d9dab847a9b0"/></dir><dir name="seller"><dir name="account"><file name="myorders.phtml" hash="51696ea86d20d3306b2ef8be2fb5e8b0"/></dir><file name="info.phtml" hash="cbfde090d5ee320918b031e1145159e0"/><file name="logo.phtml" hash="3d60bc24a72755bc5b03001537a0290e"/><file name="ratings.phtml" hash="885779d8e85ff3fb8e3f1fe50cd18c7d"/><file name="seller_ratings.phtml" hash="7307d70ae60465825fc2a31fe9b2d4ad"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Cybage_Marketplace.xml" hash="655674c415c4a30754d292b1b585f959"/></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><file name="newseller_account.html" hash="298a277968587aa17dab9571d37f1116"/><file name="pendingorder_reminder.html" hash="7698d6a043afb5d2a52571a8e373b968"/><file name="seller_payment.html" hash="1b6350fdebfe1b496d03a164f616d415"/><file name="seller_status.html" hash="8b01d0a683d8fe1d4774fc32cdfb09a7"/><dir name="sales"><file name="customer_cancelled_new.html" hash="cbfe7cfa8307995aff1d35cadb62b910"/><file name="customer_completed_new.html" hash="afd8b01955854d0235aaa4e94a41dc87"/><file name="customer_processing_new.html" hash="3521f931be71816a0a6bc81d56d0961f"/><file name="product_comment.html" hash="e251a719323814263e9f84b12601b892"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="jquery"><file name="jquery-1.9.1.min.js" hash="993baffc269ef5414ec40f3d2de19294"/></dir><dir name="marketplace"><dir name="fancybox"><file name="jquery-1.7.2.min.js" hash="09bf7cb5fd333ee8c1c6be7475f85026"/><file name="jquery.fancybox-1.3.4.pack.js" hash="0b714d85fd5a4fe7625801f8d6e7ad57"/><file name="jquery.mousewheel-3.0.4.pack.js" hash="8ed7eaa3ff4d601639bfc1d594713957"/><file name="jquery.noconflict.js" hash="3179f2255b046d5f2e9a71e365287bef"/></dir><file name="nicEdit-latest.js.js" hash="46134bdf90c2e6279bb5efe7874a0ebc"/></dir></dir></target><target name="magemedia"><dir name="marketplace"><file name="productimport.csv" hash="7b0c8a1c0d5392371a49bda7badc1298"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="marketplace"><file name="jquery.fancybox-1.3.4.css" hash="0233ba7e3d8418cebf47fc9983f65e60"/><file name="styles.css" hash="30d9bc46cec97d7627b3fce3e595c009"/></dir></dir><dir name="images"><dir name="marketplace"><dir name="fancybox"><file name="blank.gif" hash="325472601571f31e1bf00674c368d335"/><file name="fancy_close.png" hash="6e2879a324a76e9972ebc98201aae1d8"/><file name="fancy_loading.png" hash="b1d54c240cf06e7f41e372d56919b738"/><file name="fancy_nav_left.png" hash="3f3e406102152cd8236383568a40ba35"/><file name="fancy_nav_right.png" hash="216e4bde5bddeeaa60dc3d692890a68e"/><file name="fancy_shadow_e.png" hash="fd4f491080d29fade5080877f1ba4c8b"/><file name="fancy_shadow_n.png" hash="18cde16379b2ceadef714d9b346d09ec"/><file name="fancy_shadow_ne.png" hash="63adf788acf193d4e4f3642d7d793125"/><file name="fancy_shadow_nw.png" hash="c820c878aedb7a7f9ebd7135a58e7c65"/><file name="fancy_shadow_s.png" hash="9b9e5c888028aaef40fe5b6a363f1e29"/><file name="fancy_shadow_se.png" hash="a8afd5a008884380ee712d177105268f"/><file name="fancy_shadow_sw.png" hash="f81cc0fee5581d76ad3cebe47e7e791b"/><file name="fancy_shadow_w.png" hash="59b0e63eb059e58d932cfd53da4d87e6"/><file name="fancy_title_left.png" hash="1582ac2d3bef6a6445bf02ceca2741cd"/><file name="fancy_title_main.png" hash="38dad6c1ed4bdc81c0bec721b2deb8c2"/><file name="fancy_title_over.png" hash="b886fd165d4b7ac77d41fb52d87ffc60"/><file name="fancy_title_right.png" hash="6cbe0c935511e7f9a2555ccb6a7324c4"/><file name="fancybox-x.png" hash="168696d8a694214090ef90e029cdf393"/><file name="fancybox-y.png" hash="36a58859beb9a6b19322a37466b9f78e"/><file name="fancybox.png" hash="11e57e492ee0311540967cc7a1e6e3e2"/></dir><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/></dir></dir></dir></dir></dir></target></contents>
36
  <compatible/>
37
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
38
  </package>