diff --git a/app/code/community/Medma/MarketPlace/Block/Vendor/.goutputstream-DDSMMX b/app/code/community/Medma/MarketPlace/Block/Vendor/.goutputstream-DDSMMX new file mode 100644 index 0000000..75c302e --- /dev/null +++ b/app/code/community/Medma/MarketPlace/Block/Vendor/.goutputstream-DDSMMX @@ -0,0 +1,53 @@ +setTemplate('marketplace/vendor/list.phtml'); + parent::__construct(); + } + + public function getVendorListCollection() + { + //~ $vendorCollection = Mage::getModel('marketplace/profile')->getCollection(); + //~ $vendorCollection->addFieldToSelect('entity_id'); + //~ $vendorCollection->addFieldToSelect('user_id'); + //~ $vendorCollection->addFieldToSelect('image'); + + + //$userTable = Mage::getSingleton('core/resource')->getTableName('admin/user'); + //$collection = Mage :: getModel('marketplace/profile')->getCollection(); + + // Cannot append getSelect right here because $collection will not be a collection + //return $collection->getSelect()->join(array('user' => $userTable),'main_table.user_id = user.user_id','main_table.*'); + + + $collection = Mage::getModel('marketplace/profile')->getCollection(); + $collection->getSelect()->joinInner( array('cat'=> Mage::getSingleton('core/resource')->getTableName('admin/user')), 'main_table.cat_id = cat.user_id', array('user_id')); + //echo $collection->getSelect(); die; + return $collection; + + } +} + +?> diff --git a/app/code/community/Medma/MarketPlace/Block/Vendor/List.php b/app/code/community/Medma/MarketPlace/Block/Vendor/List.php new file mode 100644 index 0000000..6230843 --- /dev/null +++ b/app/code/community/Medma/MarketPlace/Block/Vendor/List.php @@ -0,0 +1,71 @@ +setTemplate('marketplace/vendor/list.phtml'); + parent::__construct(); + } + + public function getVendorListCollection() + { + $userCollection = Mage::getModel('admin/user')->getCollection() + ->addFieldToFilter('is_active', 1); + + $userCollection->getSelect()->join( + array('user_profile' => Mage::getSingleton('core/resource')->getTableName('marketplace/profile')), + 'user_profile.user_id = main_table.user_id', array('user_profile.*') + ); + + return $userCollection; + } + + public function getProductList($vendor_id) + { + return Mage::getModel('catalog/product')->getCollection()->addFieldToFilter('vendor', $vendor_id)->setPageSize(4); + } + + public function getProductImage($product_id) + { + $productModel = Mage::getModel('catalog/product')->load($product_id); + return Mage::helper('catalog/image')->init($productModel, 'small_image')->resize(91, 91); + } + + public function getVendorProfileUrl($vendorId) + { + return $this->getUrl('marketplace/vendor/profile', array('id' => $vendorId)); + } + + public function getViewAllProduct($vendorId) + { + return $this->getUrl('marketplace/vendor/items', array('id' => $vendorId)); + } + + public function getVendorImageUrl($vendorImageName) + { + $dirPath = 'vendor' . DS . 'images'; + return Mage::helper('marketplace')->getImagesUrl($dirPath) . $vendorImageName; + } +} + +?> diff --git a/app/code/community/Medma/MarketPlace/Block/Vendor/Profile/Latest.php b/app/code/community/Medma/MarketPlace/Block/Vendor/Profile/Latest.php index a8e3039..ccf00ed 100644 --- a/app/code/community/Medma/MarketPlace/Block/Vendor/Profile/Latest.php +++ b/app/code/community/Medma/MarketPlace/Block/Vendor/Profile/Latest.php @@ -44,6 +44,9 @@ public function getHighestSellingProduct() ->addAttributeToFilter('vendor', $vendorId) ->getAllIds(); + if(empty($productIds)) + return null; + $productReportCollection = Mage::getResourceModel('reports/product_collection') ->addOrderedQty() ->addAttributeToSelect('*') diff --git a/app/code/community/Medma/MarketPlace/Model/Observer.php b/app/code/community/Medma/MarketPlace/Model/Observer.php index 0cac209..332560f 100644 --- a/app/code/community/Medma/MarketPlace/Model/Observer.php +++ b/app/code/community/Medma/MarketPlace/Model/Observer.php @@ -35,6 +35,98 @@ public function catalogProductSaveBefore($observer) $product->setCategoryIds($categoryIds); } } + + public function notifyVendor($observer) + { + $orderIncrementId = Mage::getSingleton('checkout/session')->getLastRealOrderId(); + $orderObject = Mage::getModel('sales/order')->loadByIncrementId($orderIncrementId); + + $vars['billing_address'] = $orderObject->getBillingAddress()->format('html'); + $vars['shipping_address'] = $orderObject->getShippingAddress()->format('html'); + $vars['get_is_not_virtual'] = $orderObject->getIsNotVirtual(); + $vars['customer_name'] = $orderObject->getBillingAddress()->getName(); + $vars['order_no'] = $orderIncrementId; + + $head = ' + + Product + Original Price + Price + Qty + Row Total + + '; + + $orderItems = $orderObject->getAllItems(); + $orderDetails = array(); + foreach($orderItems as $item) + { + $attribute = ''; + if($options = $item->getProductOptions()) + { + foreach ($options['attributes_info'] as $option) + $attribute .='
' . $option['label'] . ': ' . $option['value'] . '
'; + } + + $vendorId = Mage::getModel('catalog/product')->load($item->getProductId())->getVendor(); + $vendorModel = Mage::getModel('admin/user')->load($vendorId); + + $orderDetails[$vendorId]['vendor_name'] = $vendorModel->getName(); + $orderDetails[$vendorId]['vendor_mail_id'] = $vendorModel->getEmail(); + $orderDetails[$vendorId]['order_items'] .= ' + + + ' . $item->getName() . '
+ SKU: ' . $item->getSku() + . $attribute . + ' + ' . Mage::helper('core')->currency($item->getData("price_incl_tax"), true, false) . ' + ' . Mage::helper('core')->currency($item->getOriginalPrice(), true, false) . ' + ' . intval($item->getQtyOrdered()) . ' + ' . Mage::helper('core')->currency($item->getData("row_total_incl_tax"), true, false) . ' + + '; + } + + foreach($orderDetails as $key => $value) + { + $vendorOrder = ''; + $vendorOrder .= $head; + $vendorOrder .= $value['order_items']; + $vendorOrder .= '
'; + + $vars['sales_email_order_items'] = $vendorOrder; + $vars['vendor_name'] = $value['vendor_name']; + $this->sendTransactionalEmail($value['vendor_mail_id'], $vars); + } + } + + public function sendTransactionalEmail($email, $vars) + { + // Transactional Email Template's ID + $templateId = Mage::getStoreConfig('marketplace/email/email_template'); + + // Set sender information + $senderInfo = Mage::getStoreConfig('marketplace/email/email_sender'); + $senderName = Mage::getStoreConfig('trans_email/ident_'.$senderInfo.'/name'); + $senderEmail = Mage::getStoreConfig('trans_email/ident_'.$senderInfo.'/email'); + + $sender = array('name' => $senderName, 'email' => $senderEmail); + + // Set recepient information + $recepientEmail = $email; + + // Get Store ID + $storeId = Mage::app()->getStore()->getId(); + + $translate = Mage::getSingleton('core/translate'); + + // Send Transactional Email + Mage::getModel('core/email_template') + ->sendTransactional($templateId, $sender, $recepientEmail, $email,$vars, $storeId); + + $translate->setTranslateInline(true); + } } ?> diff --git a/app/code/community/Medma/MarketPlace/controllers/VendorController.php b/app/code/community/Medma/MarketPlace/controllers/VendorController.php index 0ef48f7..c41b301 100644 --- a/app/code/community/Medma/MarketPlace/controllers/VendorController.php +++ b/app/code/community/Medma/MarketPlace/controllers/VendorController.php @@ -27,7 +27,7 @@ public function registerAction() public function profileAction() { - $vendorId = $this->getRequest()->getParam('id'); + $vendorId = $this->getRequest()->getParam('id'); $this->loadLayout(); $this->renderLayout(); } diff --git a/app/code/community/Medma/MarketPlace/etc/config.xml b/app/code/community/Medma/MarketPlace/etc/config.xml index aa4c951..fe0cc4d 100644 --- a/app/code/community/Medma/MarketPlace/etc/config.xml +++ b/app/code/community/Medma/MarketPlace/etc/config.xml @@ -2,7 +2,7 @@ - 2.0.2 + 2.0.3 @@ -81,7 +81,16 @@ Medma_MarketPlace_Helper - + + + + + singleton + Medma_MarketPlace_Model_Observer + notifyVendor + + + @@ -98,8 +107,17 @@ saveDomain - + + @@ -118,6 +136,15 @@ + + + + + Medma_MarketPlace.csv + + + + @@ -145,6 +172,15 @@ + + + + + Medma_MarketPlace.csv + + + + @@ -267,6 +303,10 @@ 3,6,9 + + sales + marketplace_email_email_template + diff --git a/app/code/community/Medma/MarketPlace/etc/system.xml b/app/code/community/Medma/MarketPlace/etc/system.xml index 825c66d..5a48920 100644 --- a/app/code/community/Medma/MarketPlace/etc/system.xml +++ b/app/code/community/Medma/MarketPlace/etc/system.xml @@ -43,7 +43,7 @@ select - 30 + 20 1 1 1 @@ -60,6 +60,34 @@ + + + select + 30 + 1 + 1 + 1 + + + + select + 10 + 1 + 1 + 1 + adminhtml/system_config_source_email_identity + + + + select + 20 + 1 + 1 + 1 + adminhtml/system_config_source_email_template + + + diff --git a/app/design/adminhtml/default/default/template/marketplace/sales/order/empty.phtml b/app/design/adminhtml/default/default/template/marketplace/sales/order/empty.phtml index 692b281..0e16a60 100644 --- a/app/design/adminhtml/default/default/template/marketplace/sales/order/empty.phtml +++ b/app/design/adminhtml/default/default/template/marketplace/sales/order/empty.phtml @@ -34,7 +34,7 @@

__('This is a Vendor Order Grid !!'); ?>

- __('Please find your order details from ') . '' . $this->__('Sales > Orders') . '' . $this->__(' Page.'); ?> + __('Please find your order details from Sales > Orders Page.', $this->getSalesOrderUrl());?> diff --git a/app/design/adminhtml/default/default/template/marketplace/vendor/review/empty.phtml b/app/design/adminhtml/default/default/template/marketplace/vendor/review/empty.phtml index 561bea5..9d09941 100644 --- a/app/design/adminhtml/default/default/template/marketplace/vendor/review/empty.phtml +++ b/app/design/adminhtml/default/default/template/marketplace/vendor/review/empty.phtml @@ -34,7 +34,7 @@

__('This is a Vendor Review Grid !!'); ?>

- __('Please find your vendor reviews from ') . '' . $this->__('Medma > Market Place > Review and Ratings > All Ratings') . '' . $this->__(' Page.'); ?> + __('Please find your vendor reviews from Medma > Market Place > Review and Ratings > All Ratings Page.', $this->getReviewGridUrl()); ?> diff --git a/app/design/adminhtml/default/default/template/marketplace/vendor/transaction/empty.phtml b/app/design/adminhtml/default/default/template/marketplace/vendor/transaction/empty.phtml index 7b7192c..b2c2133 100644 --- a/app/design/adminhtml/default/default/template/marketplace/vendor/transaction/empty.phtml +++ b/app/design/adminhtml/default/default/template/marketplace/vendor/transaction/empty.phtml @@ -34,7 +34,7 @@

__('This is a Vendor Transaction Grid !!'); ?>

- __('Please find your vendor transaction details from ') . '' . $this->__('Medma > Market Place > Manage Vendors') . '' . $this->__(' Page.'); ?> + __('Please find your vendor transaction details from Medma > Market Place > Manage Vendors Page. ',$this->getVendorGridUrl()); ?> diff --git a/app/design/frontend/base/default/template/marketplace/vendor/list.phtml b/app/design/frontend/base/default/template/marketplace/vendor/list.phtml new file mode 100644 index 0000000..8fe1a49 --- /dev/null +++ b/app/design/frontend/base/default/template/marketplace/vendor/list.phtml @@ -0,0 +1,41 @@ +getVendorListCollection(); ?> +

__('Sellers'); ?>

+
+ + getProductList($vendor->getUserId()); ?> + count()): ?> +
+ getImage(); ?> +
+ +
+ +
+ +
+
+ getShopName(); ?> +
+
+
+
+
+ +
+ +
+ +
+
+
+ +
+ __('View Shop'); ?> +
+ +
+
+ + +
+
diff --git a/app/locale/en_US/Medma_MarketPlace.csv b/app/locale/en_US/Medma_MarketPlace.csv new file mode 100644 index 0000000..488c783 --- /dev/null +++ b/app/locale/en_US/Medma_MarketPlace.csv @@ -0,0 +1,146 @@ +Orders,Orders +General Information,General Information +This is a Vendor Order Grid !!,This is a Vendor Order Grid !! +"Please find your order details from Sales > Orders Page.","Please find your order details from Sales > Orders Page." +Back,Back +Ship,Ship +Invoice,Invoice +Track Order,Track Order +Incl. Tax,Incl. Tax +No shipping information available,No shipping information available +Items Ordered,Items Ordered +Order Totals,Order Totals +the order confirmation email was sent,the order confirmation email was sent +the order confirmation email is not sent,the order confirmation email is not sent +Order # %s,Order # %s +Order Date,Order Date +Order Date (%s),Order Date (%s) +Order Status,Order Status +Purchased From,Purchased From +Link to the New Order,Link to the New Order +Link to the Previous Order,Link to the Previous Order +Placed from IP,Placed from IP +%s / %s rate:,%s / %s rate: +Account Information,Account Information +Customer Name,Customer Name +Email,Email +Customer Group,Customer Group +Billing Address,Billing Address +Shipping Address,Shipping Address +Product,Product +Commission Amount,Commission Amount +Vendor Amount,Vendor Amount +Original Price,Original Price +Price,Price +Qty,Qty +Row Total,Row Total +Total Commission,Total Commission +Total Vendor Amount,Total Vendor Amount +Grand Total,Grand Total +Shipping & Handling Information,Shipping & Handling Information +Payment Information,Payment Information +Order was placed using %s,Order was placed using %s +Shipping & Handling Information,Shipping & Handling Information +Order Totals,Order Totals +Items Ordered,Items Ordered +Add Transaction,Add Transaction +All Reviews,All Reviews +"Please find your vendor reviews from Medma > Market Place > Review and Ratings > All Ratings Page.","Please find your vendor reviews from Medma > Market Place > Review and Ratings > All Ratings Page." +Transactions,Transactions +"Please find your vendor transaction details from Medma > Market Place > Manage Vendors Page.","Please find your vendor transaction details from Medma > Market Place > Manage Vendors Page." +Transaction Date,Transaction Date +Order Number,Order Number +Information,Information +Credit,Credit +Debit,Debit +Net,Net +By ,By +No Transaction Found !!,No Transaction Found !! +Please select one or more attributes.,Please select one or more attributes. +Seller Information,Seller Information +Add to Favourite,Add to Favourite +Items Ordered,Items Ordered +Product Name,Product Name +SKU,SKU +Subtotal,Subtotal +order_totals,order_totals +Close,Close +From:,From: +To:,To: +Gift Message,Gift Message +Excl. Tax,Excl. Tax +Total,Total +Total incl. tax,Total incl. tax +Ordered,Ordered +Shipped,Shipped +Canceled,Canceled +Refunded,Refunded +Feedback,Feedback +Write Your Own Review,Write Your Own Review +You\'re reviewing: ,You\'re reviewing: +How do you rate this product? *,How do you rate this product? * +Submit Review,Submit Review +NOTE: ,NOTE: +This item uploaded by site admin. you can give feed back to vendor only.,This item uploaded by site admin. you can give feed back to vendor only. +Item has not been shipped yet. You can give feedback after invoice generation.,Item has not been shipped yet. You can give feedback after invoice generation. +My Favourite Sellers,My Favourite Sellers +You have no sellers added.,You have no sellers added. +Items for Sale,Items for Sale +Contact,Contact +Email: ,Email: +Phone: ,Phone: +Remove From Favourite,Remove From Favourite +Sellers,Sellers +View Shop,View Shop +Items for Sale,Items for Sale +Contact,Contact +Feedback Profile,Feedback Profile +Positive,Positive +Neutral,Neutral +Negative,Negative +1 star,1 star +2 star,2 star +3 star,3 star +4 star,4 star +5 star,5 star + star, star +Ratings not available to review this seller. ,Ratings not available to review this seller. +Request Seller,Request Seller +Personal Information,Personal Information +First Name,First Name +Last Name,Last Name +Email Address,Email Address +Business Information,Business Information +Shop Name,Shop Name +Contact Number,Contact Number +Country,Country +Verification Proof,Verification Proof +Proof Type,Proof Type +Files,Files +Add New,Add New +Login Information,Login Information +User Name,User Name +Password,Password +Confirm Password,Confirm Password +* Required Fields,* Required Fields +Submit,Submit +Title,Title +Type,Type +Summary,Summary +Note :,Note : +Your feedback has been successfully submitted. It will display after vendor\'s approval.,Your feedback has been successfully submitted. It will display after vendor\'s approval. +There are no products matching the selection.,There are no products matching the selection. +Seller Products,Seller Products +Add to Cart,Add to Cart +Out of stock,Out of stock +Learn More,Learn More +Add to Wishlist,Add to Wishlist +Add to Compare,Add to Compare +Highest Selling Product,Highest Selling Product +Latest Product Added,Latest Product Added +Show :,Show : +All,All +Date,Date +Buyer,Buyer +Item Name,Item Name +No reviews found !!,No reviews found !! diff --git a/app/locale/en_US/template/email/sales/new_vendor_order.html b/app/locale/en_US/template/email/sales/new_vendor_order.html new file mode 100644 index 0000000..838f5de --- /dev/null +++ b/app/locale/en_US/template/email/sales/new_vendor_order.html @@ -0,0 +1,81 @@ + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + +
{{var logo_alt}}
+

Dear, {{var vendor_name}}

+

+ Customer has been purchased your item. +

+
+

Your item has been ordered by {{var customer_name}}, Order # {{var order_no}}

+
+ + + + + {{depend get_is_not_virtual}} + + + {{/depend}} + + + + + + {{depend get_is_not_virtual}} + + + {{/depend}} + + +
Billing Information:Shipping Information:
+ {{var billing_address}} + + {{var shipping_address}} +   +
+
+ {{var sales_email_order_items}} +

Thank you, {{var store.getFrontendName()}}

+
+
+ diff --git a/package.xml b/package.xml index 87cd423..4c26872 100644 --- a/package.xml +++ b/package.xml @@ -1,18 +1,21 @@ Medma_MarketPlace - 2.0.2 + 2.0.3 stable OSL community Manage Vendors and its profile, manage vendor transactions and provides platform for managing their accounts. Manage Vendors and its profile, manage vendor transactions and provides platform for managing their accounts. - Resolved existing products not visible on Catalog Product List. + 1. Bug Fix on Seller profile page. +2. Transactional Mails for sellers. +3. Seller list for home page. +4. Localization Medma InfomatixMedmagaurav@medma.in - 2014-08-29 - - + 2014-10-01 + + 5.2.06.0.0 diff --git a/skin/frontend/base/default/marketplace/css/images/footer_link.png b/skin/frontend/base/default/marketplace/css/images/footer_link.png new file mode 100644 index 0000000..91210c0 Binary files /dev/null and b/skin/frontend/base/default/marketplace/css/images/footer_link.png differ diff --git a/skin/frontend/base/default/marketplace/css/styles.css b/skin/frontend/base/default/marketplace/css/styles.css index 956b085..abdcf4f 100644 --- a/skin/frontend/base/default/marketplace/css/styles.css +++ b/skin/frontend/base/default/marketplace/css/styles.css @@ -25,7 +25,7 @@ #vendor_profile h3.product-grid-header { margin-bottom: 20px; border-bottom: solid 1px #CCC; padding: 10px 0; } -#vendor_profile div.highest-selling-product-container { float: left; margin-right: 20px; width: 180px; } +#vendor_profile div.highest-selling-product-container { float: left; margin-right: 20px; width: 190px; } #vendor_profile div.highest-selling-product-container ul.profile-products-grid { margin: 0 auto; width: 128px; } #vendor_profile div.highest-selling-product-container ul.profile-products-grid li.item { float: left; margin: 0 4px 14px; width: 120px; position: relative; } #vendor_profile div.highest-selling-product-container ul.profile-products-grid li.item a.product-image { width: 100%; } @@ -37,7 +37,7 @@ #vendor_profile div.highest-selling-product-container ul.profile-products-grid li.item div.bestselling { background: url('images/best_selling.png') no-repeat; height: 60px; width: 60px; background-size: 60px 60px; position: absolute; top: 0; left: 0; margin-top: -30px; margin-left: -30px; } #vendor_profile div.product-grid-container { float: left; } -#vendor_profile div.product-grid-container ul.profile-products-grid { width: 700px; } +#vendor_profile div.product-grid-container ul.profile-products-grid { width: 690px; } #vendor_profile div.product-grid-container ul.full { width: 900px; } #vendor_profile div.product-grid-container ul.profile-products-grid li.item { float: left; margin: 0 4px 14px; width: 120px; } #vendor_profile div.product-grid-container ul.profile-products-grid li.item a.product-image { width: 100%; } @@ -103,3 +103,19 @@ div.review-data-row div.row2 { margin-top: 2px; margin-bottom: 5px; } div.review-data-row div.no-review-count { margin: 6px; } .active { color: #000000; cursor:text; text-decoration: none; } + +.vendor-block { background: #FFF; margin-right: 10px; margin-bottom: 10px; padding: 10px; width: 198px; float: left; -webkit-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); -moz-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); } +.vendor-block-header { border-bottom: solid 1px #CCC; padding-bottom: 5px; } +.vendor-block-header .vendor-image { float: left; } +.vendor-block-header .vendor-image > img { height: 50px; width: 50px; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%; -webkit-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); -moz-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); } +.vendor-block-header .vendor-name { float: left; font-weight: bold; font-size: 14px; width: 198px; height: 50px; } +.vendor-block-header .vendor-name-inner { display: table-cell; height: 50px; vertical-align: middle; } +.has-image { display: table; } +.has-image .vendor-name { margin-left: 15px; width: 133px; } +.vendor-products-container { padding: 5px 0; height: 195px; } +.vendor-product { margin: 1px; height: 91px; width: 91px; float: left; padding: 2px; } +.vendor-product:hover { z-index: 999; -webkit-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); -moz-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.75); } +.vendor-block-footer { border-top: solid 1px #CCC; padding-top: 5px; } +.vendor-block-footer .view-show { padding: 5px 25px 0px 0px; background: url(images/footer_link.png) no-repeat; background-position: 60px 4px; float: right; } +.vendor-block-footer a { color: #000000; text-decoration: none; } +h3.vendor-block-title { margin-bottom: 20px; border-bottom: solid 1px #CCC; padding: 10px 0; }