Commit Graph

127 Commits

Author SHA1 Message Date
Suraj Shetty
3cd0c54438 Fix pyhton 3 compatibility 2018-08-22 11:32:49 +05:30
Prateeksha Singh
631c170ccf [hub] fix merge conflicts 2018-08-21 21:00:53 +05:30
Prateeksha Singh
caadd8af4e [Hub] sync with insert_many, Remove Data Migration Run 💥
- Use FrappeClient insert_many to publish items
- We will be syncing small amounts of items anyway
- Also, we need only the insert action in bulk
2018-08-21 19:59:15 +05:30
Faris Ansari
ff189b6853 fix: publish items
- Pass image data as a json
- ignore duplicates while creating Hub Tracked Item
2018-08-21 19:14:44 +05:30
Prateeksha Singh
b0a3a106fc [hub] profile email uneditable, style additions, base64 sync enable 2018-08-21 17:43:30 +05:30
Prateeksha Singh
a525d12f69 [hub] sync multiple image urls
- using a simple multiselect currently
2018-08-19 22:31:33 +05:30
Prateeksha Singh
0a60d1cd96 [hub] Publishing Dialog, Sync category
- Hub Category selection
- Recycled
2018-08-19 19:39:00 +05:30
Prateeksha Singh
b614ece991 [hub] Move sync, correct legacy code 2018-08-06 17:48:45 +05:30
Prateeksha Singh
3aed5c219f [hub] make get_items generic, add legacy.py 2018-08-01 17:32:13 +05:30
Prateeksha Singh
4d4791ab39 [chore] remove imports 2018-08-01 16:42:09 +05:30
Prateeksha Singh
6495d532a6 [restructure] make api.py 2018-08-01 16:38:39 +05:30
Faris Ansari
a12076e0fd Convert image to base64 before sending Item to sync 2018-07-31 23:06:00 +05:30
Faris Ansari
c1438c6169 refactor(hub connection): read only connection
- Seller activity in Activity Log
- Move hub_url to site_config
2018-07-31 17:51:45 +05:30
Prateeksha Singh
425356c21c [hub] remove test code 2018-07-31 10:45:53 +05:30
Prateeksha Singh
46df72d55d [hub] test progress trigger 2018-07-30 13:24:01 +05:30
Prateeksha Singh
efbd2ee3f5 [hub] Realtime Sync Progress
- Show progress from the migration plan
- Show products being synced
- Disallow publishing in sync state
2018-07-30 09:17:14 +05:30
Prateeksha Singh
d27b27f88a Hub Seller Profile and Timeline
- profile details fetched from server
- timeline updates on publishing items
2018-07-29 16:52:16 +05:30
Prateeksha Singh
6f05ea124e [hub] Track Hub Sync on the Server
- Create a Hub Seller activity on start of Hub Sync
- Store its name as remote_id in the Run
- Update that activity remotely once the Run here is complete, status
2018-07-29 14:40:52 +05:30
Prateeksha Singh
dd8045759f [hub] Published Products Page 2018-07-28 01:54:51 +05:30
Prateeksha Singh
83d60ffa1d [hub] update hub item mapping 2018-07-28 00:07:25 +05:30
Prateeksha Singh
6e7fb71f1f [hub][patch] reset publish_in_hub for all items 2018-07-27 22:02:47 +05:30
Faris Ansari
b7a63ab81e Homepage
- show random items from each hub seller
- show items from country
- move add_review method on hub
2018-07-27 21:51:26 +05:30
Faris Ansari
521fe4d01d Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-07-26 18:39:34 +05:30
Faris Ansari
f4884f8108 Marketplace
- Cache hub calls
- call_hub_method using FrappeClient connection
- Become a seller UX fixes
2018-07-26 18:37:01 +05:30
Prateeksha Singh
d885248309 [hub] remove sync_in _progress set 2018-07-26 18:21:33 +05:30
Prateeksha Singh
bcd7077342 [hub] remove sync_in_progress set 2018-07-26 18:20:58 +05:30
Prateeksha Singh
d450c0ac08 [hub][publish] in_progress/empty state 2018-07-26 17:24:33 +05:30
Prateeksha Singh
b750425288 [hub] sync in progress 2018-07-26 16:25:22 +05:30
Prateeksha Singh
d1224ca662 [hub][init] add profile page 2018-07-26 13:39:06 +05:30
Prateeksha Singh
f26177bdbc [hub] setup publish items flow 2018-07-26 10:38:11 +05:30
Prateeksha Singh
1d1696080e [hub][publish] add search, fix multiple append 2018-07-26 08:36:33 +05:30
Prateeksha Singh
cf2d2a5c75 [hub][init] add publish items page 2018-07-25 20:02:12 +05:30
Prateeksha Singh
bc8caefc19 [hub] add register as a seller page 2018-07-25 11:08:23 +05:30
Faris Ansari
0fbaa72504 Add review area 2018-07-25 00:49:11 +05:30
Faris Ansari
ea2d1b0a19 New page: marketplace
- subpages: home, favourites, item, category
2018-07-23 18:44:46 +05:30
Prateeksha Singh
e73df88863 [hub][minor] remove links #14309 2018-06-04 10:26:49 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
Prateeksha Singh
4b7dcfad54 [hub] add hub settings access regardless 2018-04-05 14:50:42 +05:30
Prateeksha Singh
420c79041e [fix] company listing context 2018-04-05 14:44:16 +05:30
Prateeksha Singh
b60a52b194 Hub Market (#13325)
* [hub] enable hub with OAuth token from user's client ID

* [hub] settings schema for adding users

* [hub] image view style listing

* [hub] broken image link fallback

* [wip]

* [hub] bootstrap timeline

* [hub] setup quick view

* [hub] reformat ratings, add companies autocomplete filter

* [hub] common listing frames

* [hub] setup sort selector

* [hub] timeline

* [hub] customize list header

* [hub] genuine form fieldtypes

* [hub] review products

* [hub] suggest missing categories remotely

* [hub] Wishlist; header and title templates

* [hub] link wishlist, remove company migration

* [hub] calculate ratings
2018-04-03 10:44:13 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
Prateeksha Singh
0acb63a938
Update hub domain 💥 2018-02-16 11:07:12 +05:30
Prateeksha Singh
387a242232
Merge pull request #12928 from pratu16x7/hub-pages
Hub pages
2018-02-15 11:05:22 +05:30
Prateeksha Singh
2073959bb8 Update entity properties 2018-02-15 10:24:16 +05:30
Prateeksha Singh
6ee035ba5b tree parent working 2018-02-15 08:50:31 +05:30
Prateeksha Singh
25d5a1d890 add company pages 2018-02-14 19:53:18 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests (#12900)
* Fixed translations and tests

* minor fixes

* minor test fixes
2018-02-14 17:44:06 +05:30
Achilles Rasquinha
1c86d18837 Added Hub Company Logo 2018-02-14 16:05:32 +05:30
Prateeksha Singh
4413ce1be1 company page, deprecate custom page 2018-02-07 23:50:01 +05:30
Prateeksha Singh
3eaccffbd9 [hub] items searchable via core filters 2018-02-05 12:58:30 +05:30
Prateeksha Singh
b8e9c9be08 [hub] form (info) view for items 2018-02-05 12:58:30 +05:30
Faris Ansari
9b64620bc0 [hub] hub page using BaseList 2018-02-05 12:57:49 +05:30
Nabin Hait
d0249b0880
Employee advance (#11875)
* Employee Advances against Expense Claim

* added employee advance test cases and docs

* Default Employee Advance Account field in company

* Cleanup and fixes of employee advance
2017-12-14 13:25:57 +05:30
Prateeksha Singh
1126a43979 [fix] hub connection, fixes #11357 2017-12-11 23:22:30 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms 2017-11-17 12:41:56 +05:30
Rushabh Mehta
a5ebebd09c
[enhance] Add Issue Type and Opportunity Type masters (#11598)
* [enhance] added & linked Issue Type & Opportunity Type with opportunity

* [patch] create issue and opportunity type from the custom field if available

* [minor] issue_type and opportunity type should be mandatory

* [patches] removed try catch from the patch

* [fix] patch

* [refactor] cleanup issue/opportunity type
2017-11-16 17:03:52 +05:30
tunde
ffa659fd2c Merge branch 'develop' into payment-terms 2017-11-14 09:59:45 +01:00
Saurabh
3be72ef187 Merge branch 'master' into develop 2017-11-02 12:14:41 +05:30
Faris Ansari
40611e4f69 [fix] hub get_item_details (#11383) 2017-10-31 13:00:09 +05:30
tunde
5ea10a77a3 Merge branch 'develop' into payment-terms 2017-10-27 17:37:15 +01:00
tunde
14e97ce0c8 Merge branch 'develop' into payment-terms 2017-10-26 13:35:42 +01:00
Faris Ansari
33d74ce6e5 Merge branch 'develop' into hub-item-image 2017-10-25 18:06:42 +05:30
Makarand Bauskar
085b4842a1 [minor] minor fixes in get_company_details for Hub page (#11168) 2017-10-25 12:19:10 +05:30
Nabin Hait
4072d71769 Delete api.py 2017-10-11 23:53:57 +05:30
Faris Ansari
7997271368 [hub] fix company page routing 2017-10-11 15:46:21 +05:30
Faris Ansari
d635a2646b fix Hub Sync plan 2017-10-09 19:30:11 +05:30
Faris Ansari
e3a5899980 [hub] Add hub category filters, fix minor issues (#11079) 2017-10-05 19:43:08 +05:30
Prateeksha Singh
925e9776e8 [hub] rename is_hub_item to is_item_from_hub (#11069)
* [hub] rename is_hub_item to is_item_from_hub

* [rename] is_hub_item to is_item_from_hub
2017-10-05 17:17:41 +05:30
Nabin Hait
26507d7867 Removed deprecated hub functions 2017-10-05 13:10:32 +05:30
Faris Ansari
fd345f8e90 Hub (#10934)
* [WIP]Hub

* [listing] Show items, users and item_groups

* Show filters

* [start] cart, api for rfq and opp

* rfq working

* [wip] keys

* wip quotes

* [hub] register/unregister

* [hub] rename password to access_token, remove passed company field

* [hub] publishing cases, api call wrapper

* [hub] add and remove fields working

* [hub] fix flags, update on client save working

* [hub] new hub page, client item CUD at hub working

* listing, standard rate, local site hack

* item listing, item page, search, back to home

* [hub] implement hub company

* [hub] company filter

* [hub] basic rfq-ing, item page cleanup

* categories wip

* [hub] use get_doc_before_save()

* [hub] send opportunity message to hub, api to make locally

* [hub] enqueueing in hub api request wrapper

* cleanup

* [hub] refactor shopping cart's product.py to reuse

* sync dynamic item fields daily

* Scheduler heartbeat check

* [wip] hub categories

* [hub] wip enqueued callbacks

* [hub] outgoing messages, fixing callback loop

* [hub] bug: callback save after primary save

* [hub] pricing, stock, currency

* [hub] replace send_hub_request with make_and_enqueue

* add hub.less, refactor code

* Remove template html files, add styling for hub item cards

* fix paging

* add breadcrumb

* Add sidebar

* [hub] add company page, change country

* [hub] order_by filters

* [hub] make hub category a tree

* [hub] enqueue batched item enqueueing

* [hub] requested products page

* [minor]

* update hub url

* [fix] url

* [fix] more reform

* fix recursion

* [hub] data migration plans as jsons

* Hub register, create data connector, sync with run

* [add] user registration by session user

* Removed hub_message

* Remove sync code from hub_settings

* Remove hub methods from item.py

* Update Hub Sync plan

* Hub unregister

* Update Hub connector on reregister

* Dont delete Hub Connector on unregister

* Enable hub on success response

* Add new hub whitelisted methods

* [hub] list working

* Hub register from hub page

* [hub] Add hub logo in desk icon, link to page

* [hub] hide page head on empty state

* [hub] make rfq

* [hub] push opportunity doc, poll for opportunity docs

* add fields to item mapping

* update hub mappings

* Make RFQ

* [hub] item, home routing

* Make rfq and send opportunity refactor

* [hub][fix] remote lead data

* images passed as base64

* set default company on register

* Revert "images passed as base64"

This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4.

* Add sync to hub page

* Prompt for publish items to hub

* add post process to hub document to lead

* Rename Hub document to Hub message, create opportunity in post process
2017-10-05 11:17:30 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Anand Doshi
8b66f2a691 Exported all doctypes 2015-08-27 16:45:52 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Rushabh Mehta
4ea1ade7b9 [hub] start 2015-02-18 19:09:56 +05:30