Skip to content

Commit

Permalink
Ashwin (#398)
Browse files Browse the repository at this point in the history
SaaS beta
  • Loading branch information
Alfred-Martinez committed Jul 21, 2020
1 parent 5bde5a6 commit 1a93c94
Show file tree
Hide file tree
Showing 166 changed files with 597 additions and 637 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ media
media-images
cache
.idea
CACHE/
static/CACHE
.sass-cache/
main.css
main.css.map
Expand All @@ -16,6 +16,10 @@ ref.css.map
.coverage
crm/dev_settings\.py
env
.env
docs/build
celerybeat-schedule
local_settings.py
media
.sass-cache
server.log
41 changes: 6 additions & 35 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,15 @@
Python 3.5.2:
script:
- export PY_EXE=python3.5.2
- virtualenv -p python3 env
- source env/bin/activate
- pip install --no-cache-dir -r requirements.txt
- python manage.py test --keepdb --parallel --noinput
- coverage run --source=accounts,cases,common,contacts,leads,opportunity,tasks,invoices,events,teams,marketing manage.py test --keepdb --noinput
- coverage report -m
except:
- tags

deploy_mp:
stage: deploy
environment:
name: live
script:
- sudo /bin/rm -rf /home/dj_crm/dj_crm/; cp -r . /home/dj_crm/dj_crm
- source /home/dj_crm/env/bin/activate
- pip install -r /home/dj_crm/dj_crm/requirements.txt
- python /home/dj_crm/dj_crm/manage.py migrate --noinput
- sudo /etc/init.d/uwsgi restart
- sudo /usr/bin/supervisorctl restart all
only:
- master
tags:
- djcrm_micropyramid

deploy_live:
stage: deploy
environment:
name: live
script:
- sudo /bin/rm -rf /home/dj_crm/dj_crm/; cp -r . /home/dj_crm/dj_crm
- source /home/dj_crm/env/bin/activate
- pip install -r /home/dj_crm/dj_crm/requirements.txt
- python /home/dj_crm/dj_crm/manage.py migrate --noinput
- python /home/dj_crm/dj_crm/manage.py rebuild_index --noinput
- sudo /etc/init.d/uwsgi restart
- df -h
- sudo /bin/rm -rf /home/bottlecrm/bottlecrm/; cp -r . /home/bottlecrm/bottlecrm/
- source /home/bottlecrm/env/bin/activate
- pip install -r /home/bottlecrm/bottlecrm/requirements.txt
- python /home/bottlecrm/bottlecrm/manage.py migrate --noinput
- sudo /usr/bin/supervisorctl restart all
only:
- master
tags:
- github-crm
- bottlecrm-com
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
repos:
- repo: https://github.com/ambv/black
rev: stable
hooks:
- id: black
language_version: python3.6
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
python:
- "3.5.2"
- "3.6.9"

services:
- redis-server
Expand All @@ -13,7 +13,7 @@ addons:
sudo: required

env:
-DJANGO=1.11
-DJANGO=3.0.6

before_install:
- gem install sass
Expand Down
80 changes: 80 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
Django-CRM
==========

Django CRM is opensource CRM developed on django framework. It has all
the basic features of CRM to start with. We welcome code contributions
and feature requests via github.

<http://django-crm.readthedocs.io> for latest documentation

This project contains the following modules.

> - Contacts
> - Accounts
> - Invoices
> - Cases
> - Leads
> - Opportunity
> - Planner
## Try for free [here](https://bottlecrm.com/)
---

# Installation
We recommend ubuntu 18.04 or ubuntu 20.04. These instructions are verified for ubuntu 20.04

#### System Requirements
---

```
sudo apt install postgresql xvfb libfontconfig wkhtmltopdf git libpq-dev python3-dev python3-pip gem ruby ruby-dev build-essential libssl-dev libffi-dev python3-venv redis-server redis-tools -y
sudo gem install sass
```

#### Install dependencies
---

```
pip install -r requirements.txt
```

#### env variables
* Then refer to env.md for environment variables and keep those in the .env file in the current folder as your project is in. Refer https://github.com/theskumar/python-dotenv
* add ```127.0.0.1 test.localhost``` to your hosts file ```/etc/hosts``` Then you can use test as company name to register and login
#### next steps
```
python manage.py migrate
python manage.py runserver
```
Then open http://localhost:8000 in your borwser and create a new account with test as company name. We mapped test.localhost to 127.0.0.1 So, it should work properly.

Community
=========

Get help or stay up to date.

- [Issues](<https://github.com/MicroPyramid/Django-CRM/issues>)
- Follow [@micropyramid](<https://twitter.com/micropyramid>) on Twitter
- Ask questions on [Stack Overflow](<https://stackoverflow.com/questions/tagged/django-crm>)
- Chat with community [Gitter](<https://gitter.im/MicroPyramid/Django-CRM>)
- For customisations, email to <django-crm@micropyramid.com>

Credits
-------

### Contributors

This project exists thanks to all the people who contribute!

![image](https://opencollective.com/django-crm/contributors.svg?width=890&button=false)


Feature requests and bug reports
================================

We welcome your feedback and support, raise github issue if you want to
report a bug or request new feature. we are glad to help.

For commercial support [Contact us](https://micropyramid.com/contact-us/)
169 changes: 0 additions & 169 deletions README.rst

This file was deleted.

2 changes: 1 addition & 1 deletion accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ def get_complete_address(self):
self.get_billing_country_display(),
]
address = utils.append_str_to(address, *add_to_address)
return address

return address

@property
def created_on_arrow(self):
Expand Down
2 changes: 1 addition & 1 deletion accounts/templates/accounts.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'sales/base.html' %}
{% load staticfiles %}
{% load static %}
{% load paginate %}
{% load thumbnail %}
{% block extralinks %}
Expand Down
2 changes: 1 addition & 1 deletion accounts/templates/create_account.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'sales/base.html' %}
{% load staticfiles %}
{% load static %}
{% block breadcrumb %}
{% block extralinks %}

Expand Down
2 changes: 1 addition & 1 deletion accounts/templates/create_mail_accounts.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'sales/base.html' %}
{% load staticfiles %}
{% load static %}
{% load paginate %}
{% block extralinks %}
{% load thumbnail %}
Expand Down
2 changes: 1 addition & 1 deletion accounts/templates/error_template.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}
{% load paginate %}
{% block content %}

Expand Down
2 changes: 1 addition & 1 deletion accounts/templates/view_account.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'sales/base.html' %}
{% load staticfiles %}
{% load static %}
{% load thumbnail %}
{% block breadcrumb %}

Expand Down
1 change: 0 additions & 1 deletion accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -768,4 +768,3 @@ def get_email_data_for_account(request):
return JsonResponse(ctx)
else:
return JsonResponse({"error": True, "data": "No emails found."})

Loading

0 comments on commit 1a93c94

Please sign in to comment.