-
-
Notifications
You must be signed in to change notification settings - Fork 184
🎉 saas apps #100
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Enigma228322
wants to merge
60
commits into
it-projects-llc:12.0
Choose a base branch
from
Enigma228322:12.0-saas_apps
base: 12.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
🎉 saas apps #100
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit
Hold shift + click to select a range
845b109
:tada: first commit
Enigma228322 b98976d
:bomb: developing process
Enigma228322 e3b5afa
:bomb: Added Manage Apps view in website configuration
Enigma228322 29848c6
:bomb: Added 'Refresh' button
Enigma228322 235ebc2
:bomb: started js low flexing
Enigma228322 40f02c3
:bomb: Added a little bit calculator logic
Enigma228322 e8dd2e8
:bomb: Added apps choosing logic
Enigma228322 58234c9
:bomb: Added price window
Enigma228322 9e61bae
:bomb: made beautiful price window
Enigma228322 eb2907d
:bomb: Added tree traversal in js and a little bit in python
Enigma228322 81e4d1e
:bomb: Added tree
Enigma228322 79c35c7
:bomb: Added child_tree and onload func in js
Enigma228322 3154109
:bomb: Made many2many instead one2many btw saas.lines and saas.module…
Enigma228322 f1a14e0
:bomb: Added pictures and fixied bug with :contains selector, when se…
Enigma228322 1440f2d
:bomb: shifted block with modules in center
Enigma228322 b0fa938
:bomb: Made frontend like pushka
Enigma228322 c47992f
:bomb: Changed allow_to_sell vars changing in overrided write functio…
Enigma228322 e776229
:bomb: Made access lvl public for not autorized users
Enigma228322 d1136db
:bomb: Added new template creating and redirecting to new db(Without …
Enigma228322 29911a7
:bomb: Added auto authorization
Enigma228322 337085a
:bomb: Added method that collects and sends all modules dependencies …
Enigma228322 d2aa52b
:bomb: Fixed bug with 'default' named modules
Enigma228322 787c8e1
:bomb: Now applications only is visible
Enigma228322 8147ade
:bomb: Added loader and indent corrections
Enigma228322 9b5d380
:green_heart:
Enigma228322 cfa5293
:bomb: Made fields editable
Enigma228322 5c64909
:bomb: temporary
Enigma228322 80673c3
:bomb: Corrected frontend
Enigma228322 0e1086b
:green_heart:
Enigma228322 b038cd6
:bomb: Added saas.line price changing
Enigma228322 009f9a1
:bomb: Added currency and fixed some bugs
Enigma228322 ea56bde
:bomb: Added currency linked to the company
Enigma228322 8419591
:bomb: now template doesn't creates every time, when build creates
Enigma228322 07f7d44
:bomb: Added 'set_as_base' field in saas_template and this field chec…
Enigma228322 fde507d
:bomb: added price blink in box, and divided apps price and users price
Enigma228322 b5ba13d
:bomb: added feature to integrate saas_apps with sign_up form
Enigma228322 77dfd5a
:bomb: Fixed error with same saas.template.operator name creation
Enigma228322 32dbf36
:bomb: added base_template record in demo data and docs
Enigma228322 992e60d
:bomb: Added loader in the begining and choosen_modules saving in loc…
Enigma228322 1085d17
:bomb: Changed 'Get Started' button, to 'Try trial' and 'Buy now'
Enigma228322 0a8c338
:bomb: Added packages
Enigma228322 1a757b0
:bomb: Added binary icons and corrected saas_apps form view
Enigma228322 c571c0c
:bomb: Deleted unnecessary method and added website_sale dependence
Enigma228322 e0b6343
:arrow_down::one::two:
Enigma228322 540cb72
:bomb: Added users changing buttons at /price page
Enigma228322 c2210a4
:bomb: Added apps and packages visibility properties in website settings
Enigma228322 838e4a6
:bomb: fixed bug, when price window is absent, values keep calculating
Enigma228322 e5fb5d5
:bomb: fixed bug, when saas_apps installs, theres an error with packa…
Enigma228322 b1f4710
:bomb: Changed saas_apps settings h2 body
Enigma228322 e7ecfcc
:base: Added app alingnment when they're less than 3
Enigma228322 e589d21
:book: Added show apps and show packs instr
Enigma228322 dd76550
:bomb: Now product.product 'website_published' field related to saas.…
Enigma228322 bd57266
:bomb: Changed product.product model relation to product.template
Enigma228322 da1e5db
:bomb: Fixed bug. When /price loads button listeners didnt initialize…
Enigma228322 47c2974
:bomb: Litle fix to avoid a huge error
Enigma228322 da04c05
:bomb: Fixed error, when saas template and package creates in the sam…
Enigma228322 0dbe77d
:bomb: Added show 'buy now' button option in settings
Enigma228322 37a8121
:bomb: Deleted unnecessary css classes
Enigma228322 a5b9676
:bomb: 'Try trial' and 'Buy now' are hiding when no application is se…
Enigma228322 2324ede
:bomb: Fixed bug when currency isn't visible when apps aren't selected
Enigma228322 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
💣 Added apps choosing logic
Signed-off-by: Vildan Safin <safin@it-projects.info>
- Loading branch information
commit e8dd2e8c2a01d99b30e03226b9d85f3ddd20c88f
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,48 @@ | ||
| /* Copyright 2020 Vildan Safin <https://github.com/Enigma228322> | ||
| License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).*/ | ||
|
|
||
| odoo.define('saas_apps.model', function (require){ | ||
| 'use_strict'; | ||
|
|
||
| var session = require('web.session'); | ||
|
|
||
| var price = 0; | ||
| var per_month = true; | ||
| /* Also need to add this https://odoo-development.readthedocs.io/en/latest/dev/pos/send-pos-orders-to-server.html#saving-removed-products-of-pos-order-module*/ | ||
| var choosen = [] | ||
|
|
||
| window.onclick=function(e){ | ||
| if(window.location.pathname === "/price" && e.target.id == "application") | ||
| price_period = per_month ? 'month' : 'year'; | ||
| if(window.location.pathname === "/price" && e.target.className.includes("application")){ | ||
| // Looking at choosen period | ||
| var price_period = per_month ? 'month' : 'year'; | ||
| // Getting choosen module dependecies | ||
| session.rpc('/what_dependencies', { | ||
| args: [e.target.innerText, price_period] | ||
| }).then(function (result) { | ||
| console.log(result); | ||
| /* Be carefull with dependecies when changing programm logic, | ||
| cause first dependence - is module himself*/ | ||
| var i = 0; | ||
| for(; i < result.dependencies.length; ++i) | ||
| if(!choosen.includes(result.dependencies[i])) | ||
| { | ||
| choosen.push(result.dependencies[i]); | ||
| $(".application:contains('"+result.dependencies[i]+"')")[0].style.color = "green"; | ||
| }else{ | ||
| choosen.splice(choosen.indexOf(result.dependencies[i]), 1); | ||
| if(i == 0){ | ||
| $(".application:contains('"+result.dependencies[i]+"')")[0].style.color = "black"; | ||
| break; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| function Calc_Price(){ | ||
| // Calculate general price | ||
| var users_price_period = per_month ? 12.5 : 10.0; | ||
| return price + parseInt(('#users')[0].value, 10)*users_price_period; | ||
| } | ||
|
|
||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Комментарий нужен?