Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
845b109
:tada: first commit
Enigma228322 Feb 22, 2020
b98976d
:bomb: developing process
Enigma228322 Feb 24, 2020
e3b5afa
:bomb: Added Manage Apps view in website configuration
Enigma228322 Feb 28, 2020
29848c6
:bomb: Added 'Refresh' button
Enigma228322 Feb 29, 2020
235ebc2
:bomb: started js low flexing
Enigma228322 Mar 2, 2020
40f02c3
:bomb: Added a little bit calculator logic
Enigma228322 Mar 3, 2020
e8dd2e8
:bomb: Added apps choosing logic
Enigma228322 Mar 3, 2020
58234c9
:bomb: Added price window
Enigma228322 Mar 3, 2020
9e61bae
:bomb: made beautiful price window
Enigma228322 Mar 6, 2020
eb2907d
:bomb: Added tree traversal in js and a little bit in python
Enigma228322 Mar 6, 2020
81e4d1e
:bomb: Added tree
Enigma228322 Mar 7, 2020
79c35c7
:bomb: Added child_tree and onload func in js
Enigma228322 Mar 13, 2020
3154109
:bomb: Made many2many instead one2many btw saas.lines and saas.module…
Enigma228322 Mar 17, 2020
f1a14e0
:bomb: Added pictures and fixied bug with :contains selector, when se…
Enigma228322 Mar 17, 2020
1440f2d
:bomb: shifted block with modules in center
Enigma228322 Mar 17, 2020
b0fa938
:bomb: Made frontend like pushka
Enigma228322 Mar 17, 2020
c47992f
:bomb: Changed allow_to_sell vars changing in overrided write functio…
Enigma228322 Mar 18, 2020
e776229
:bomb: Made access lvl public for not autorized users
Enigma228322 Mar 19, 2020
d1136db
:bomb: Added new template creating and redirecting to new db(Without …
Enigma228322 Mar 27, 2020
29911a7
:bomb: Added auto authorization
Enigma228322 Mar 28, 2020
337085a
:bomb: Added method that collects and sends all modules dependencies …
Enigma228322 Mar 29, 2020
d2aa52b
:bomb: Fixed bug with 'default' named modules
Enigma228322 Mar 29, 2020
787c8e1
:bomb: Now applications only is visible
Enigma228322 Mar 30, 2020
8147ade
:bomb: Added loader and indent corrections
Enigma228322 Mar 31, 2020
9b5d380
:green_heart:
Enigma228322 Mar 31, 2020
cfa5293
:bomb: Made fields editable
Enigma228322 Apr 2, 2020
5c64909
:bomb: temporary
Enigma228322 Apr 6, 2020
80673c3
:bomb: Corrected frontend
Enigma228322 Apr 6, 2020
0e1086b
:green_heart:
Enigma228322 Apr 7, 2020
b038cd6
:bomb: Added saas.line price changing
Enigma228322 Apr 7, 2020
009f9a1
:bomb: Added currency and fixed some bugs
Enigma228322 Apr 8, 2020
ea56bde
:bomb: Added currency linked to the company
Enigma228322 Apr 10, 2020
8419591
:bomb: now template doesn't creates every time, when build creates
Enigma228322 Apr 14, 2020
07f7d44
:bomb: Added 'set_as_base' field in saas_template and this field chec…
Enigma228322 Apr 15, 2020
fde507d
:bomb: added price blink in box, and divided apps price and users price
Enigma228322 Apr 20, 2020
b5ba13d
:bomb: added feature to integrate saas_apps with sign_up form
Enigma228322 Apr 21, 2020
77dfd5a
:bomb: Fixed error with same saas.template.operator name creation
Enigma228322 Apr 21, 2020
32dbf36
:bomb: added base_template record in demo data and docs
Enigma228322 Apr 21, 2020
992e60d
:bomb: Added loader in the begining and choosen_modules saving in loc…
Enigma228322 Apr 22, 2020
1085d17
:bomb: Changed 'Get Started' button, to 'Try trial' and 'Buy now'
Enigma228322 Apr 24, 2020
0a8c338
:bomb: Added packages
Enigma228322 May 2, 2020
1a757b0
:bomb: Added binary icons and corrected saas_apps form view
Enigma228322 May 7, 2020
c571c0c
:bomb: Deleted unnecessary method and added website_sale dependence
Enigma228322 May 8, 2020
e0b6343
:arrow_down::one::two:
Enigma228322 May 9, 2020
540cb72
:bomb: Added users changing buttons at /price page
Enigma228322 May 10, 2020
c2210a4
:bomb: Added apps and packages visibility properties in website settings
Enigma228322 May 11, 2020
838e4a6
:bomb: fixed bug, when price window is absent, values keep calculating
Enigma228322 May 11, 2020
e5fb5d5
:bomb: fixed bug, when saas_apps installs, theres an error with packa…
Enigma228322 May 12, 2020
b1f4710
:bomb: Changed saas_apps settings h2 body
Enigma228322 May 12, 2020
e7ecfcc
:base: Added app alingnment when they're less than 3
Enigma228322 May 12, 2020
e589d21
:book: Added show apps and show packs instr
Enigma228322 May 15, 2020
dd76550
:bomb: Now product.product 'website_published' field related to saas.…
Enigma228322 May 19, 2020
bd57266
:bomb: Changed product.product model relation to product.template
Enigma228322 May 20, 2020
da1e5db
:bomb: Fixed bug. When /price loads button listeners didnt initialize…
Enigma228322 May 20, 2020
47c2974
:bomb: Litle fix to avoid a huge error
Enigma228322 May 25, 2020
da04c05
:bomb: Fixed error, when saas template and package creates in the sam…
Enigma228322 May 26, 2020
0dbe77d
:bomb: Added show 'buy now' button option in settings
Enigma228322 May 28, 2020
37a8121
:bomb: Deleted unnecessary css classes
Enigma228322 Jun 1, 2020
a5b9676
:bomb: 'Try trial' and 'Buy now' are hiding when no application is se…
Enigma228322 Jun 1, 2020
2324ede
:bomb: Fixed bug when currency isn't visible when apps aren't selected
Enigma228322 Jun 1, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
💣 Deleted unnecessary method and added website_sale dependence
  • Loading branch information
Enigma228322 committed May 8, 2020
commit c571c0c72d97f4eb7481d42fe8892c00a95e9c83
2 changes: 1 addition & 1 deletion saas_apps/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# "price": 9.00,
# "currency": "EUR",

"depends": ['website', 'saas_public'],
"depends": ['website', 'saas_public', 'website_sale'],
"external_dependencies": {"python": [], "bin": []},
"data": [
'security/ir.model.access.csv',
Expand Down
1 change: 0 additions & 1 deletion saas_apps/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class SaaSAppsController(Controller):
def user_page(self, **kw):
apps = request.env['saas.line'].sudo()
packages = request.env['saas.template'].sudo()
apps.delete_app_duplicates()
if not apps.search_count([]):
apps.refresh_lines()
return request.render('saas_apps.index', {
Expand Down
11 changes: 0 additions & 11 deletions saas_apps/models/saas_apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,6 @@ def make_product(self, app):
'image_1920': app.app_image
})

def delete_app_duplicates(self):
apps = self.search([('application', '=', True)])
prod_templ = self.env["product.product"]
for app in apps:
products = prod_templ.search([('name', '=', app.module_name)])
if products > 1:
for product in products - products[0]:
product.unlink()
for extra in app - app[0]:
extra.unlink()

def change_product_price(self, app, price):
app.product_id.price = price

Expand Down