Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,822 Commits 3 Branches 0 Tags 1 GiB
b861c4bc46
Commit Graph

1350 Commits

Author SHA1 Message Date
Prateeksha Singh
b2eadfe31d [hub] show become a seller button to all, but not dialog 2018-09-03 17:31:43 +05:30
Faris Ansari
d4bba297c2 fix: Container title 2018-09-03 17:12:22 +05:30
Faris Ansari
28652baacc Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e fix: email in profile dialog 2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17 [fix] add message for admin users before register dialog 
- use is_registered api for page routes
 2018-09-03 16:39:59 +05:30
Faris Ansari
ad0be6aaa2 fix: Messages 
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
 2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109 [marketplace] Disallow unregistered routes if not registered 2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85 [hub] ask company description in dialog 2018-09-03 13:11:23 +05:30
Prateeksha Singh
85563ddfd3 [hub] update publish hub api 2018-09-03 02:44:27 +05:30
Prateeksha Singh
5511e06f06 [hub][api] Update save and view api to be user specific 2018-09-03 02:25:41 +05:30
Faris Ansari
68129df74c feat: Add add_user dialog and methods 
- wip
 2018-09-02 18:29:00 +05:30
Prateeksha Singh
b2b745fc7a [hub] simplify marketplace settings, remove company fields 
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
 2018-09-01 17:20:08 +05:30
Faris Ansari
255dd0e03d feat: Add new registration flow 2018-09-01 14:30:46 +05:30
Prateeksha Singh
4e1fd0b417 [hub] register_seller -> register_marketplace 
- resgister_seller will be for subsequent users
- make username and password readonly
- check if password present before trying to create connection
 2018-09-01 09:55:43 +05:30
Prateeksha Singh
a8065ff725 [hub] move register_seller to api, remove old code 2018-08-31 22:41:26 +05:30
Prateeksha Singh
c726fce4b1 [hub] set first user's password in marketplace users 2018-08-31 20:42:48 +05:30
Prateeksha Singh
ea2b9cbd1c [hub] add user selection in register 2018-08-31 17:56:50 +05:30
Faris Ansari
c05bf262f1
Merge pull request #15279 from netchampfaris/marketplace-fixes-3 
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
 2018-08-31 16:52:26 +05:30
Faris Ansari
f9a66c1c36 fix: Rename Hub Settings -> Marketplace Settings 2018-08-31 16:30:34 +05:30
Faris Ansari
25f509ebd3 feat: Add disable marketplace option in Hub Settings 2018-08-31 15:35:32 +05:30
Faris Ansari
91ac26c2ff fix(seller dialog): Email should be session user email (#15270) 2018-08-30 19:19:57 +05:30
Rushabh Mehta
49f9747385 major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) 
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc

* fix: remove debug
 2018-08-30 18:50:48 +05:30
Nabin Hait
f6b784e39e Test fixes 2018-08-30 18:42:35 +05:30
Prateeksha Singh
ecad873d19 [hub] remove item.js, fix seller decription condition 2018-08-30 16:21:26 +05:30
Prateeksha Singh
5797565dd0 Merge with upstream 2018-08-30 16:15:27 +05:30
Prateeksha Singh
ff52e93e69 [hub] Merge conflicts 2018-08-30 16:11:41 +05:30
Prateeksha Singh
997bfa4916 [hub] add review timeline element 2018-08-30 16:08:52 +05:30
Faris Ansari
f3034ae262 feat: Add Report Item dialog 2018-08-30 16:05:15 +05:30
Faris Ansari
8e04487253 fix: Rename 'Product' to 'Item' 2018-08-30 15:35:17 +05:30
Prateeksha Singh
dc36d52ef9 [hub] fix review send 2018-08-30 15:12:18 +05:30
Faris Ansari
6b695d32b2 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 14:36:14 +05:30
Faris Ansari
90265aec24 fix: Page container routing 2018-08-30 14:36:05 +05:30
Faris Ansari
062cd62484 fix: Add restrictions for session user who is not hub seller 2018-08-30 14:35:56 +05:30
Prateeksha Singh
bff2bdc858 [hub] UI and empty state in 'your products' to guide on publishing 2018-08-30 12:58:46 +05:30
Prateeksha Singh
47f5f0e608 [hub] remove See All from non expandable sections 2018-08-30 12:16:08 +05:30
Prateeksha Singh
b20c4e3184 [hub] remove client hub_settings scripts 
- multiline to single line messages to translate
 2018-08-30 12:01:04 +05:30
Prateeksha Singh
04d051bb73 [hub] add review area 2018-08-30 02:42:13 +05:30
Faris Ansari
ff8f1c6120 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-29 15:02:47 +05:30
Faris Ansari
64202ad416 fix: Only a System Manager can register as a seller 
- every other user has read only access
 2018-08-29 15:02:39 +05:30
Prateeksha Singh
02c176c0e6 [hub] fix code lint issues, styles 2018-08-29 14:27:47 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Faris Ansari
8bc954ecc6 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 18:29:08 +05:30
Faris Ansari
b26381e6b8 fix: Scroll to top when route changes 2018-08-28 18:29:01 +05:30
Prateeksha Singh
bd7d964848 [hub] Merge Develop 2018-08-28 18:25:07 +05:30
Prateeksha Singh
2d45373f33 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 17:25:01 +05:30
Prateeksha Singh
1e02f00075 [hub] record views, update favourite api 2018-08-28 17:24:31 +05:30
Faris Ansari
6df06cac97 fix: Show empty state if there are no items 2018-08-28 17:19:35 +05:30
Faris Ansari
c12f48da2d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 17:17:36 +05:30
Faris Ansari
5689494f9c chore: Remove old messages page 2018-08-28 16:52:17 +05:30
Suraj Shetty
b92403fbed Add 'Become Seller' as a primary key 
- Also remove some unwanted code
 2018-08-28 15:04:33 +05:30
Suraj Shetty
f994e3ec6b Remove 'Become Seller' option from sidebar 2018-08-28 15:03:01 +05:30
Suraj Shetty
ec12b34a79 Add margin below publish area 2018-08-27 20:37:06 +05:30
Suraj Shetty
49c37d5a8e Add strip html filter 2018-08-27 20:31:29 +05:30
Faris Ansari
a4dcb6f548 fix: Add empty state in Selling 2018-08-27 19:57:12 +05:30
Faris Ansari
725603c0a9 feat: Selling Page 
- common Messages page for both buying and selling
 2018-08-27 19:51:36 +05:30
Prateeksha Singh
bc859cbf1d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-27 15:16:53 +05:30
Prateeksha Singh
872768d89f [hub] merge conflicts 2018-08-27 15:16:19 +05:30
Suraj Shetty
dc7e8e6a26 Replace hub_item_code -> hub_item_name 2018-08-27 14:11:48 +05:30
Maxwell Morais
a2c1d92374 Revert "Fix shipping_address for DropShipping" (#15218) 
* Revert "Cleaned up welcome email code (#15175)"

This reverts commit 771fbb8f01.

* Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)"

This reverts commit 2b72d09948.

* Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)"

This reverts commit c5cf428d00.

* Revert "[Minor] Create default department on country setup (#15206)"

This reverts commit 2b2712bb9e.

* Revert "Permissions issue in BOM tree"

This reverts commit 8fe8d1758a.

* Revert "Fix indentation accounts_receivable.py (#15203)"

This reverts commit fbc3df3247.

* Revert "Fix shipping_address for DropShipping (#15202)"

This reverts commit 4a394bcbf4.
 2018-08-27 12:05:41 +05:30
Prateeksha Singh
fa26899cd0 [hub] added DetailHeaderItem to detail pages, contact seller button 2018-08-27 10:49:42 +05:30
Prateeksha Singh
d0a952bcda [hub] Register components, init Item Page 
- commonly used components are pre-registered
- add DetailHeaderItem component
- begin ItemPage
 2018-08-27 10:12:45 +05:30
Faris Ansari
f089dad7c7 feat: Sidebar in vue 2018-08-26 22:20:16 +05:30
Faris Ansari
d37108d18e fix: Add back link to Buying 2018-08-26 22:19:56 +05:30
Faris Ansari
23e45ada69 chore: Remove old messages files 2018-08-26 22:19:29 +05:30
Faris Ansari
ea82fb9f80 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 20:09:12 +05:30
Faris Ansari
caebd4a9b9 feat: Buying and BuyingMessages in vue 2018-08-26 20:09:02 +05:30
Faris Ansari
019bfd3940 feat: Add helper directives 
- v-route
  automatically route to a valid frappe route
- v-img-src
  handle img loading and error handling
 2018-08-26 20:08:40 +05:30
Faris Ansari
bf5cc7d823 feat: SectionHeader component 2018-08-26 20:00:42 +05:30
Faris Ansari
4a2ea993fd fix(search-input): submit on enter 2018-08-26 19:49:20 +05:30
Faris Ansari
fad623eb27 feat: Add dynamic routes in PageContainer 2018-08-26 19:48:52 +05:30
Prateeksha Singh
fad0f64c94 [hub][vue] add action object in empty state, make NotFound page 2018-08-26 18:27:04 +05:30
Prateeksha Singh
5c9b13f5e5 [hub][vue] add skeleton state to DetailView 2018-08-26 18:06:25 +05:30
Prateeksha Singh
9e8d7bbeda [hub][vue] Seller Page 2018-08-26 16:29:32 +05:30
Prateeksha Singh
80a8dfd6ba Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 13:09:52 +05:30
Prateeksha Singh
5e30beec86 [hub][vue] DetailView and Profile page 2018-08-26 13:09:19 +05:30
Faris Ansari
888dd606ff feat: Add PageContainer 2018-08-26 12:41:02 +05:30
Suraj Shetty
0e59ec3ed2 Update messages UI 2018-08-26 10:07:00 +05:30
Suraj Shetty
88700cf2b9 Separate links for selling and buying messages 
- Add separate UI for selling messages
- Remove some redundant code messages
 2018-08-26 10:06:27 +05:30
Prateeksha Singh
de426cb543 [hub][vue] Home page, add section title in item key in v-for 2018-08-25 21:54:49 +05:30
Prateeksha Singh
53fada1ae9 [hub][vue] search page 2018-08-25 20:31:48 +05:30
Prateeksha Singh
0be2859f5b [hub][vue] Category and Published Products pages 2018-08-25 15:54:43 +05:30
Prateeksha Singh
c31e5c0013 [hub][vue] replace page files, fix item 'seen' prop 2018-08-25 14:09:01 +05:30
Prateeksha Singh
00175eab8e [hub][vue] Saved Products Page, remote item card 
- also undo unfavouriting items
 2018-08-25 13:18:30 +05:30
Prateeksha Singh
fe41713974 [hub][vue] add import 2018-08-24 16:53:34 +05:30
Prateeksha Singh
40f7c4663a [hub][vue] Publish Page 2018-08-24 16:38:34 +05:30
Prateeksha Singh
67e0374261 [hub] add data-driven notification message 2018-08-23 23:55:04 +05:30
Prateeksha Singh
b696b2965d [hub][vue] add empty state and dynamic publish button 2018-08-23 21:25:53 +05:30
Prateeksha Singh
d7d2bb261b [hub] add SearchInput 2018-08-23 13:52:41 +05:30
Prateeksha Singh
6e5b9a8f9b Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-23 12:23:09 +05:30
Prateeksha Singh
ff616b8845 [hub][vue] init item card container in vue 2018-08-23 12:22:20 +05:30
Maxwell Morais
4a394bcbf4 Fix shipping_address for DropShipping (#15202) 
This stretch of javascript go against the address definition for DropShipping.
When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address.

To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.
 2018-08-23 11:08:37 +05:30
Suraj Shetty
341386e3a7 Add list view for messages 2018-08-22 21:31:16 +05:30
Suraj Shetty
d94701e5cc Add recent message block to item_card 2018-08-22 16:47:50 +05:30
Suraj Shetty
b361c234b1 Remove unused message to avoid confusion 2018-08-22 16:44:55 +05:30
Suraj Shetty
7ee79498fc Hide review option for unregistered user 2018-08-22 12:09:40 +05:30
Suraj Shetty
831ff42101 Stop event bubbling on clicking edit item 2018-08-22 11:52:20 +05:30
Suraj Shetty
12de0aec11 Fix publish button alignment 2018-08-22 11:50:23 +05:30
Suraj Shetty
7a040c4dd8 Show favorite button only for registered user 2018-08-22 11:32:49 +05:30
Faris Ansari
e745e85d98 feat: route to message room page after contact seller dialog 2018-08-21 19:48:42 +05:30
Faris Ansari
e7af44f1a6 fix: remove items with invalid image 2018-08-21 19:48:06 +05:30
Faris Ansari
a22aa60a17 Merge with upstream 2018-08-21 19:17:25 +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
Faris Ansari
d29a3b3567 Highlight links with part route or full route 2018-08-21 19:12:10 +05:30
Prateeksha Singh
b0a3a106fc [hub] profile email uneditable, style additions, base64 sync enable 2018-08-21 17:43:30 +05:30
Faris Ansari
d17aedb719 Add BuyingMessages page 2018-08-20 18:33:46 +05:30
Faris Ansari
8de6380648 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 15:58:58 +05:30
Prateeksha Singh
71b41b4771 [hub] response data in hub call event trigger 2018-08-20 15:42:48 +05:30
Prateeksha Singh
e72a2fa9de [hub] emit hub call event to set category options while publishing 2018-08-20 14:18:07 +05:30
Prateeksha Singh
6faffa5007 [feat] new component: ItemPublishDialog 2018-08-20 14:02:33 +05:30
Prateeksha Singh
4ce54b0011 [feat] new component: NotificationMessage 2018-08-20 13:07:23 +05:30
Prateeksha Singh
42be665412 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 10:08:49 +05:30
Prateeksha Singh
96fdbd467d [hub][feat] stateful publishing area 2018-08-20 10:07:56 +05:30
Prateeksha Singh
fe67508d60 [hub][feat] Edit your Profile, recycle profile dialog 2018-08-20 01:18:41 +05:30
Prateeksha Singh
305f7375d1 [hub] Register in a dialog instead of Page 
- in order to recycle it for Edit Profile
- Also, the register page had too much custom code
 2018-08-20 00:25:26 +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
Faris Ansari
2ce2e1b6b0 feat(messages): split messages into buying and selling 
- messages will be organized by their purpose, i.e Buying and Selling
- on clicking the buying item, the message room page will be opened
where sellers can communicate
- invalidate cache using event key
 2018-08-17 18:39:36 +05:30
Faris Ansari
335c0f200f feat: custom cache invalidation for hub calls 
In some cases, we know when to invalidate the cache.
This feature allows to do just that.
erpnext.hub namespace is now an EventEmitter instance.
 2018-08-17 16:04:14 +05:30
Faris Ansari
c1fe1c45c7 feat: empty states for favourites and search page 2018-08-17 14:29:42 +05:30
Faris Ansari
aa46567439 refactor: rename hub-card-container to hub-items-container 2018-08-17 14:29:22 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
Prateeksha Singh
460e2798cd [hub] Favourites UI 
- remove from listing
- add to favourites
 2018-08-14 11:42:40 +05:30
Shreya Shah
0631aed3d9 Discount amount field in all transactions' child tables (#15124) 
* Add discount_amount and base_discount_amount in Sales Invoice Item

* Add patch for existing documents

* Discount amount field in all child tables of Purchase and Selling

* Remove console statements
 2018-08-14 10:51:48 +05:30
Prateeksha Singh
1a0fb5b63a Add detail page favourited state 2018-08-14 01:31:03 +05:30
Prateeksha Singh
c5a9972785 [refactor][major] Separate out Components 
- item_card
- item_card_container
- detail_view
- search_bar
- reviews
- skeleton_state
- empty_state
- empty_state
 2018-08-13 21:36:07 +05:30
Saurabh
20fb443f0c [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
Prateeksha Singh
b777f3dbfd [layout][iterate] item detail page actions 2018-08-10 10:38:28 +05:30
rohitwaghchaure
8356d4b892 [Fix] disable_rounded_total not found error (#15113) 2018-08-09 15:51:11 +05:30
Rushabh Mehta
4d0b8da0e5 fix(style): modal for website 2018-08-08 14:48:02 +05:30
Solufyin
3be899caff Item Alternate Image Features in e-commerce site. (#15044) 
* [ADD] Added Item Alternate Image Features in e-commerce site.

* [IMP] Improved Code for Item Alternate Image Feature.

* [IMP] Improved code for Item alternative image functionality.

* Remove .css file and make a build for erpnext-web.css

* Cleanup styling for item alternate image, also add delegated handler

* Spaces -> Tabs

* Spaces -> Tabs in item.html
 2018-08-07 18:28:39 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
Prateeksha Singh
28d52dfe0c [hub][fix] Category page api call 2018-08-07 12:56:56 +05:30
Prateeksha Singh
318cca8cae [hub] Add 'See All' for Category items 
- Also remove special `cursor: pointer` style
- Set it for all elements having a data-route
 2018-08-07 12:41:21 +05:30
Prateeksha Singh
82b9508622 Add Products by Seller 2018-08-07 12:02:14 +05:30
Prateeksha Singh
658d1bbae2 Fix product header styles 2018-08-06 19:13:10 +05:30
Prateeksha Singh
d3da401ef4 Home: Category-wise Items 2018-08-06 18:31:26 +05:30
Prateeksha Singh
a5f6e54b70 fix merge conflict 2018-08-06 13:56:53 +05:30
Prateeksha Singh
106856b1ab Show View count on items 2018-08-02 02:07:04 +05:30
Prateeksha Singh
32a2148651 [hub] Company (Seller) page 2018-08-02 01:42:23 +05:30
Faris Ansari
eeedc3bb47 Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 19:19:58 +05:30
Faris Ansari
2a81b4acd6 Messages: first cut 2018-08-01 19:19:53 +05:30
rohitwaghchaure
ae4ff5a403 [Fix] In words showing grand total instead of rounded total (#15065) 2018-08-01 18:09:51 +05:30
Nabin Hait
041a5c2d3b
Get Advances and auto allocate (#14970) 2018-08-01 18:07:39 +05:30
Zarrar
7f8024c516 [Enhancement] Tax Withholding Category (#15064) 
* add single, cumulative threshold, remove checkboxes

* remove tds child table from supplier & add tds link field

* add description field in tax withholding category

* add tax withholding data for indian setup, some fixes

* add a checkbox for tax withholding in purchase invoice

* remove supplier's child table for tds

* enable tds field if supplier has tds set inits master

* move rates data to child table - adding fiscal year support

* change bootstrap data according to child table config of tds

* show category name in list view

* loyalty program fixes

* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry

* add fiscal year dependency in company test

* minor loyalty program fix

* minor tier calculation fix

* minor handling duplicate exception

* toggle apply_tds according to supplier, code rectify

* minor fixes for loyalty program

* test case for single and cumulative threshold

* codacy fix
 2018-08-01 17:45:05 +05:30
Nabin Hait
e45ec661ea
Additional fields in Item Price (#14540) 
* [IMPROVEMENT] Item Price New Fields and Features

* [IMPROVEMENT] Item Price

 - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
 - Stock Setting to accept Default Price List for Purchase or Sales Item
 - Move Item Section in Item Price

* Fetch default Item Price based on Customer as null

* test fixes

* Code cleanup and fixed the issue of incorrect item price fetched against the customer

* Removed min qty from packing_increment calculation

* Removed auto_update_price_list_rate from the stock settings

* Revert sales_order.json changes

* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings

* Removed unnecessory file

* Fixed item price validation code
 2018-08-01 17:44:34 +05:30
Prateeksha Singh
3aed5c219f [hub] make get_items generic, add legacy.py 2018-08-01 17:32:13 +05:30
Prateeksha Singh
b4e9ec33cb Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 16:39:10 +05:30
Prateeksha Singh
6495d532a6 [restructure] make api.py 2018-08-01 16:38:39 +05:30
Faris Ansari
5249307f27 Prevent access of registered routes 2018-08-01 16:29:40 +05:30
Faris Ansari
2de046fbed Add generic action handler to subpage 2018-08-01 15:57:28 +05:30
Faris Ansari
de85f24383 Rename base_page to subpage 2018-08-01 15:57:13 +05:30
Faris Ansari
fbe9a46d51 Add Marketplace link to user dropdown in toolbar 2018-08-01 15:56:39 +05:30
Faris Ansari
709a4a3f4e Break marketplace.js into multiple files 2018-08-01 14:09:07 +05:30
Faris Ansari
c0a22a689e Item Menu dropdown 2018-08-01 13:35:32 +05:30
Faris Ansari
057839298c fix get_category call 2018-07-31 19:06:11 +05:30
Faris Ansari
300c07c3d9 Use hub.call for categories and favourites 2018-07-31 18:02:13 +05:30
Faris Ansari
1ff25279bf Remove old hub styles 2018-07-31 17:59:03 +05:30
Faris Ansari
b1d6f94cdf Merge branch 'hub-redesign' into hub-redesign-contact-seller 2018-07-31 14:54:58 +05:30
Faris Ansari
2ae80fd000 wip 2018-07-31 12:02:20 +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
811cc3f78f [hub] resolve merge conflicts 2018-07-29 18:05:07 +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
Faris Ansari
296848cb69 Publish Page 
- Code cleanup
- Separate local item card and hub item card
- Use make_search_bar
 2018-07-28 16:14:22 +05:30
Faris Ansari
abcc8ab8e5 Push review area to bottom 2018-07-28 13:57:16 +05:30
Prateeksha Singh
d0a1a4fe90 [hub] differentiate self-published items 2018-07-28 13:16:09 +05:30
Prateeksha Singh
f6f429fb10 [hub] Item page skeleton 2018-07-28 12:25:14 +05:30
Prateeksha Singh
dd8045759f [hub] Published Products Page 2018-07-28 01:54:51 +05:30
Faris Ansari
19d40cafba Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-07-27 21:51:31 +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
Prateeksha Singh
f4fbf5215b [hub][search] empty search and route fallback 2018-07-27 21:07:56 +05:30
Faris Ansari
44f7d2e62b SearchPage 2018-07-27 15:33:00 +05:30
Faris Ansari
24d5f17255 NotFound page for marketplace 2018-07-26 19:22:58 +05:30
Faris Ansari
b5ce1976b8 Move marketplace code back to marketplace.js 2018-07-26 18:46:38 +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
cae856cbda Add marketplace back to hub_listing 2018-07-26 18:39:28 +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
Faris Ansari
2ca5afa214 Move marketplace ui to marketplace.js 2018-07-26 18:35:04 +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
505f6f14e9 [hub][publish] select/deselect all items 2018-07-26 08:06:21 +05:30
Prateeksha Singh
9685d7c37a [hub] registered vs read-only views 2018-07-26 01:12:00 +05:30
Prateeksha Singh
cf2d2a5c75 [hub][init] add publish items page 2018-07-25 20:02:12 +05:30
Faris Ansari
6b07898ef0 semicolon 2018-07-25 17:07:26 +05:30
Faris Ansari
ed1190126e Fix Syntax Error in hub_factory.js 2018-07-25 16:51:01 +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
Zlash65
617532b2cb Factory: class.extend -> es6 class 2018-07-24 14:20:10 +05:30
Faris Ansari
ea2d1b0a19 New page: marketplace 
- subpages: home, favourites, item, category
 2018-07-23 18:44:46 +05:30
Prateeksha Singh
ebb5662cb7
[revert] modules dropdown 2018-07-23 17:04:34 +05:30
Faris Ansari
f585197045 Cleanup homepage 2018-07-23 11:55:07 +05:30
Faris Ansari
789ad180ea
Merge pull request #14969 from netchampfaris/financial-statement-reports 
Financial Reports fixes
 2018-07-21 12:28:31 +05:30
Prateeksha Singh
abca510f9a
Update conf.js 2018-07-20 16:07:50 +05:30
Faris Ansari
5986d59b01 Financial Reports 
- Update formatter for use with DataTable
- Fetch Currency from  filters and fallback to company currency
 2018-07-20 15:11:55 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30