Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,309 Commits 3 Branches 0 Tags 1 GiB
32a2148651
Commit Graph

69 Commits

Author SHA1 Message Date
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